Merge pull request #17 from matomo-org/2.x-dev

Rename Piwik -> Matomo
matomo-org · Feb 14, 2018 · df16f20 · df16f20
2 parents adf8feb + 751cc88
commit df16f20
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,11 @@
-# Piwik/Cache
+# Matomo/Cache
 
 This is a PHP caching library based on [Doctrine cache](https://github.com/doctrine/cache) that supports different backends. 
-At [Piwik](http://piwik.org) we developed this library with the focus on speed as we make heavy use of caching and 
+At [Matomo](https://matomo.org) we developed this library with the focus on speed as we make heavy use of caching and 
 sometimes fetch hundreds of entries from the cache in one request.
 
-[![Build Status](https://travis-ci.org/piwik/component-cache.svg?branch=master)](https://travis-ci.org/piwik/component-cache)
-[![Coverage Status](https://coveralls.io/repos/piwik/component-cache/badge.png?branch=master)](https://coveralls.io/r/piwik/component-cache?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/piwik/component-cache/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/piwik/component-cache/?branch=master)
+[![Build Status](https://travis-ci.org/matomo-org/component-cache.svg?branch=master)](https://travis-ci.org/matomo-org/component-cache)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/matomo-org/component-cache/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/matomo-org/component-cache/?branch=master)
 
 ## Installation
 
@@ -15,7 +14,7 @@ With Composer:
 ```json
 {
     "require": {
-        "piwik/cache": "*"
+        "matomo/cache": "*"
     }
 }
 ``` 
@@ -78,7 +77,7 @@ Use this one if you read hundreds or thousands of cache entries and if performan
 
 ```php
 $options = array('directory' => '/path/to/cache');
-$factory = new \Piwik\Cache\Backend\Factory();
+$factory = new \Matomo\Cache\Backend\Factory();
 $backend = $factory->buildBackend('file', $options);
 ```
 
@@ -92,7 +91,7 @@ $options = array(
     'database' => 15, // optional
     'password' => 'secret', // optional
 );
-$factory = new \Piwik\Cache\Backend\Factory();
+$factory = new \Matomo\Cache\Backend\Factory();
 $backend = $factory->buildBackend('redis', $options);
 ```
 
@@ -103,7 +102,7 @@ $options = array(
     'backends' => array('array', 'file'),
     'file'     => array('directory' => '/path/to/cache')
 );
-$factory = new \Piwik\Cache\Backend\Factory();
+$factory = new \Matomo\Cache\Backend\Factory();
 $backend = $factory->buildBackend('redis', $options);
 ```
 
@@ -119,10 +118,10 @@ using the array cache so the next read within this request will be fast and won'
 [Description lazy cache.](#lazy)
 
 ```php
-$factory = new \Piwik\Cache\Backend\Factory();
+$factory = new \Matomo\Cache\Backend\Factory();
 $backend = $factory->buildBackend('file', array('directory' => '/path/to/cache'));
 
-$cache = new \Piwik\Cache\Lazy($backend);
+$cache = new \Matomo\Cache\Lazy($backend);
 $cache->fetch('myid');
 $cache->contains('myid');
 $cache->delete('myid');
@@ -135,7 +134,7 @@ $cache->flushAll();
 [Description eager cache.](#eager)
 
 ```php
-$cache = new \Piwik\Cache\Eager($backend, $storageId = 'eagercache');
+$cache = new \Matomo\Cache\Eager($backend, $storageId = 'eagercache');
 $cache->fetch('myid');
 $cache->contains('myid');
 $cache->delete('myid');
@@ -151,7 +150,7 @@ It will cache all set cache entries under the cache entry `eagercache`.
 [Description transient cache.](#transient)
 
 ```php
-$cache = new \Piwik\Cache\Transient();
+$cache = new \Matomo\Cache\Transient();
 $cache->fetch('myid');
 $cache->contains('myid');
 $cache->delete('myid');

diff --git a/composer.json b/composer.json
@@ -1,24 +1,24 @@
 {
-    "name": "piwik/cache",
+    "name": "matomo/cache",
     "type": "library",
     "license": "LGPL-3.0",
     "description": "PHP caching library based on Doctrine cache",
     "keywords": ["cache","array","file","redis"],
     "authors": [
         {
-            "name": "The Piwik Team",
-            "email": "hello@piwik.org",
-            "homepage": "http://piwik.org/the-piwik-team/"
+            "name": "The Matomo Team",
+            "email": "hello@matomo.org",
+            "homepage": "https://matomo.org/the-matomo-team/"
         }
     ],
     "autoload": {
         "psr-4": {
-            "Piwik\\Cache\\": "src/"
+            "Matomo\\Cache\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\Piwik\\Cache\\": "tests/"
+            "Tests\\Matomo\\Cache\\": "tests/"
         }
     },
     "require": {

diff --git a/src/Backend.php b/src/Backend.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache;
+namespace Matomo\Cache;
 
 /**
  * Backend interface

diff --git a/src/Backend/ArrayCache.php b/src/Backend/ArrayCache.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 class ArrayCache implements Backend
 {

diff --git a/src/Backend/Chained.php b/src/Backend/Chained.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 /**
  * TODO: extend Doctrine ChainCache as soon as available

diff --git a/src/Backend/Factory.php b/src/Backend/Factory.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 class Factory
 {

diff --git a/src/Backend/Factory/BackendNotFoundException.php b/src/Backend/Factory/BackendNotFoundException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend\Factory;
+namespace Matomo\Cache\Backend\Factory;
 
 use \Exception;
 

diff --git a/src/Backend/File.php b/src/Backend/File.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
 use Doctrine\Common\Cache\PhpFileCache;
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 /**
  * This class is used to cache data on the filesystem.

diff --git a/src/Backend/NullCache.php b/src/Backend/NullCache.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 /**
  * Can be used in development to prevent caching. Does not cache anything.

diff --git a/src/Backend/Redis.php b/src/Backend/Redis.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache\Backend;
+namespace Matomo\Cache\Backend;
 
 use Doctrine\Common\Cache\RedisCache;
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 class Redis extends RedisCache implements Backend
 {

diff --git a/src/Cache.php b/src/Cache.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache;
+namespace Matomo\Cache;
 
 interface Cache
 {

diff --git a/src/Eager.php b/src/Eager.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache;
+namespace Matomo\Cache;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 /**
  * This cache uses one "cache" entry for all cache entries it contains.

diff --git a/src/Lazy.php b/src/Lazy.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache;
+namespace Matomo\Cache;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 class Lazy implements Cache
 {
@@ -90,7 +90,7 @@ public function flushAll()
     private function getCompletedCacheIdIfValid($id)
     {
         $this->checkId($id);
-        return 'piwikcache_' . $id;
+        return 'matomocache_' . $id;
     }
 
     private function checkId($id)

diff --git a/src/Transient.php b/src/Transient.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  *
  */
-namespace Piwik\Cache;
+namespace Matomo\Cache;
 
-use Piwik\Cache\Backend;
+use Matomo\Cache\Backend;
 
 /**
  * This class is used to cache data during one request.

diff --git a/tests/Backend/ChainedTest.php b/tests/Backend/ChainedTest.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL v3 or later
  */
 
-namespace Tests\Piwik\Cache\Backend;
+namespace Tests\Matomo\Cache\Backend;
 
-use Piwik\Cache\Backend\ArrayCache;
-use Piwik\Cache\Backend\Chained;
-use Piwik\Cache\Backend\NullCache;
+use Matomo\Cache\Backend\ArrayCache;
+use Matomo\Cache\Backend\Chained;
+use Matomo\Cache\Backend\NullCache;
 
 /**
- * @covers \Piwik\Cache\Backend\Chained
+ * @covers \Matomo\Cache\Backend\Chained
  */
 class ChainedTest extends \PHPUnit_Framework_TestCase
 {