feature #17522 [Cache] Use generator in ArrayAdapter (gcds)

fabpot · fabpot · commit 48d91a83b63d · 2016-01-25T15:53:15.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Cache] Use generator in ArrayAdapter | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17435 | License | MIT | Doc PR | - Commits ------- 367e784 [Cache] Use generator in ArrayAdapter
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -58,16 +58,11 @@ public function getItem($key)
      */
     public function getItems(array $keys = array())
     {
-        $f = $this->createCacheItem;
-        $items = array();
-        $now = time();
-
         foreach ($keys as $key) {
-            $isHit = isset($this->expiries[$this->validateKey($key)]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key));
-            $items[$key] = $f($key, $isHit ? $this->values[$key] : null, $isHit);
+            $this->validateKey($key);
         }
 
-        return $items;
+        return $this->generateItems($keys);
     }
 
     /**
@@ -176,4 +171,15 @@ private function validateKey($key)
 
         return $key;
     }
+
+    private function generateItems(array $keys)
+    {
+        $f = $this->createCacheItem;
+
+        foreach ($keys as $key) {
+            $isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
+
+            yield $key => $f($key, $isHit ? $this->values[$key] : null, $isHit);
+        }
+    }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
@@ -21,6 +21,7 @@ class ArrayAdapterTest extends CachePoolTest
 {
     protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testDeferredExpired' => 'Failing for now, needs to be fixed.',
     );
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -22,6 +22,7 @@ class DoctrineAdapterTest extends CachePoolTest
 {
     protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
         'testDeferredExpired' => 'Failing for now, needs to be fixed.',
     );
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
@@ -22,6 +22,7 @@ class ProxyAdapterTest extends CachePoolTest
 {
     protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testDeferredExpired' => 'Failing for now, needs to be fixed.',
     );
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class ArrayAdapterTest extends CachePoolTest`
`21`	`21`	`{`
`22`	`22`	`protected $skippedTests = array(`
`23`	`23`	`'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',`
	`24`	`+ 'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',`
`24`	`25`	`'testDeferredExpired' => 'Failing for now, needs to be fixed.',`
`25`	`26`	`);`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ class DoctrineAdapterTest extends CachePoolTest`
`22`	`22`	`{`
`23`	`23`	`protected $skippedTests = array(`
`24`	`24`	`'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',`
	`25`	`+ 'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',`
`25`	`26`	`'testDeferredExpired' => 'Failing for now, needs to be fixed.',`
`26`	`27`	`);`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ class ProxyAdapterTest extends CachePoolTest`
`22`	`22`	`{`
`23`	`23`	`protected $skippedTests = array(`
`24`	`24`	`'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',`
	`25`	`+ 'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',`
`25`	`26`	`'testDeferredExpired' => 'Failing for now, needs to be fixed.',`
`26`	`27`	`);`
`27`	`28`