bug #25822 [Cache] Fix handling of apcu_fetch() edgy behavior (nicola…

…s-grekas) This PR was merged into the 3.3 branch. Discussion ---------- [Cache] Fix handling of apcu_fetch() edgy behavior | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Replaces #25819. Cannot be tested as I don't know how to trigger this behavior. Commits ------- c707c4c [Cache] Fix handling of apcu_fetch() edgy behavior
symfony · Jan 17, 2018 · 6d08d7f · 6d08d7f
2 parents 65b48b5 + c707c4c
commit 6d08d7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -29,7 +29,7 @@ public function createCachePool($defaultLifetime = 0)
         }
         if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
             if ('testWithCliSapi' !== $this->getName()) {
-                $this->markTestSkipped('APCu extension is required.');
+                $this->markTestSkipped('apc.enable_cli=1 is required.');
             }
         }
         if ('\\' === DIRECTORY_SEPARATOR) {

diff --git a/src/Symfony/Component/Cache/Traits/ApcuTrait.php b/src/Symfony/Component/Cache/Traits/ApcuTrait.php
@@ -52,7 +52,11 @@ private function init($namespace, $defaultLifetime, $version)
     protected function doFetch(array $ids)
     {
         try {
-            return apcu_fetch($ids) ?: array();
+            foreach (apcu_fetch($ids, $ok) ?: array() as $k => $v) {
+                if (null !== $v || $ok) {
+                    yield $k => $v;
+                }
+            }
         } catch (\Error $e) {
             throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
         }