Merge branch 'master' into add-simple-cache-prefix-decorator

Author: prisis

.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes    export-ignore
+.github/          export-ignore
+.gitignore        export-ignore
+.travis.yml       export-ignore
+/phpunit.xml.dist export-ignore
+/Tests/           export-ignore

Changelog.md

@@ -4,6 +4,12 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+## 1.0.0
+
+### Removed 
+
+- Dependency on `cache/hierarchical-cache`
+
 ## 0.1.2
 
 ### Changed

Tests/PrefixedCachePoolTest.php

@@ -16,16 +16,14 @@
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
- * We should not use constants on interfaces in the tests. Tests should break if the constant is changed.
- *
  * @author Tobias Nyholm <[email protected]>
  */
 class PrefixedCachePoolTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject|CacheItemPoolInterface
      */
-    private function getHierarchyCacheStub()
+    private function getCacheStub()
     {
         return $this->getMockBuilder(CacheItemPoolInterface::class)->setMethods(
             ['getItem', 'getItems', 'hasItem', 'clear', 'deleteItem', 'deleteItems', 'save', 'saveDeferred', 'commit']
@@ -38,7 +36,7 @@ public function testGetItem()
         $key         = 'key';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('getItem')->with($prefix.$key)->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -52,7 +50,7 @@ public function testGetItems()
         $key1        = 'key1';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('getItems')->with([$prefix.$key0, $prefix.$key1])->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -65,7 +63,7 @@ public function testHasItem()
         $key         = 'key';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('hasItem')->with($prefix.$key)->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -78,11 +76,11 @@ public function testClear()
         $key         = 'key';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('clear')->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
-        $this->assertEquals($returnValue, $pool->clear($key));
+        $this->assertEquals($returnValue, $pool->clear());
     }
 
     public function testDeleteItem()
@@ -91,7 +89,7 @@ public function testDeleteItem()
         $key         = 'key';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('deleteItem')->with($prefix.$key)->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -105,7 +103,7 @@ public function testDeleteItems()
         $key1        = 'key1';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('deleteItems')->with([$prefix.$key0, $prefix.$key1])->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -114,11 +112,12 @@ public function testDeleteItems()
 
     public function testSave()
     {
+        /** @type CacheItemInterface $item */
         $item        = $this->getMockBuilder(CacheItemInterface::class)->getMock();
         $prefix      = 'ns';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('save')->with($item)->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -127,11 +126,12 @@ public function testSave()
 
     public function testSaveDeffered()
     {
+        /** @type CacheItemInterface $item */
         $item        = $this->getMockBuilder(CacheItemInterface::class)->getMock();
         $prefix      = 'ns';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('saveDeferred')->with($item)->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);
@@ -143,7 +143,7 @@ public function testCommit()
         $prefix      = 'ns';
         $returnValue = true;
 
-        $stub = $this->getHierarchyCacheStub();
+        $stub = $this->getCacheStub();
         $stub->expects($this->once())->method('commit')->willReturn($returnValue);
 
         $pool = new PrefixedCachePool($stub, $prefix);

composer.json

@@ -1,19 +1,20 @@
 {
-    "name":              "cache/prefixed-cache",
-    "description":       "A decorator that makes your cache support prefix",
-    "type":              "library",
-    "license":           "MIT",
+    "name": "cache/prefixed-cache",
+    "description": "A decorator that makes your cache support prefix",
+    "type": "library",
+    "license": "MIT",
     "minimum-stability": "dev",
-    "keywords":          [
+    "prefer-stable": true,
+    "keywords": [
         "cache",
         "psr-6",
         "prefix"
     ],
-    "homepage":          "http://www.php-cache.com/en/latest/",
-    "authors":           [
+    "homepage": "http://www.php-cache.com/en/latest/",
+    "authors": [
         {
-            "name":     "Tobias Nyholm",
-            "email":    "[email protected]",
+            "name": "Tobias Nyholm",
+            "email": "[email protected]",
             "homepage": "https://github.com/nyholm"
         }
     ],
@@ -23,12 +24,12 @@
         "psr/simple-cache":         "^1.0",
         "cache/hierarchical-cache": "^0.4"
     },
-    "require-dev":       {
-        "phpunit/phpunit":         "^4.0 || ^5.1",
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.21",
         "cache/integration-tests": "^0.16"
     },
-    "autoload":          {
-        "psr-4":                 {
+    "autoload": {
+        "psr-4": {
             "Cache\\Prefixed\\": ""
         },
         "exclude-from-classmap": [
@@ -37,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2-dev"
+            "dev-master": "1.0-dev"
         }
     }
 }