remove extra call to isValidKey (googleapis#167)

itsjmed · Sep 13, 2017 · d624df6 · d624df6
1 parent acce35f
commit d624df6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/Cache/MemoryCacheItemPool.php b/src/Cache/MemoryCacheItemPool.php
@@ -51,7 +51,6 @@ public function getItems(array $keys = [])
         $items = [];
 
         foreach ($keys as $key) {
-            $this->isValidKey($key);
             $items[$key] = $this->hasItem($key) ? clone $this->items[$key] : new Item($key);
         }
 

diff --git a/tests/Cache/MemoryCacheItemPoolTest.php b/tests/Cache/MemoryCacheItemPoolTest.php
@@ -159,12 +159,44 @@ public function testCommitsDeferredItems()
      * @expectedException \Psr\Cache\InvalidArgumentException
      * @dataProvider invalidKeys
      */
-    public function testCheckInvalidKeys($key)
+    public function testCheckInvalidKeysOnGetItem($key)
     {
         $this->pool->getItem($key);
+    }
+
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     * @dataProvider invalidKeys
+     */
+    public function testCheckInvalidKeysOnGetItems($key)
+    {
         $this->pool->getItems([$key]);
+    }
+
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     * @dataProvider invalidKeys
+     */
+    public function testCheckInvalidKeysOnHasItem($key)
+    {
         $this->pool->hasItem($key);
+    }
+
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     * @dataProvider invalidKeys
+     */
+    public function testCheckInvalidKeysOnDeleteItem($key)
+    {
         $this->pool->deleteItem($key);
+    }
+
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     * @dataProvider invalidKeys
+     */
+    public function testCheckInvalidKeysOnDeleteItems($key)
+    {
         $this->pool->deleteItems([$key]);
     }