bug #18485 [Cache] Workaround krakjoe/apcu#170 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f1d12a1c0799 · 2016-04-12T21:07:53.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Cache] Workaround krakjoe/apcu#170 | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | krakjoe/apcu#170 | License | MIT | Doc PR | - Commits ------- 98dce41 [Cache] Workaround krakjoe/apcu#170
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -72,6 +72,17 @@ protected function doDelete(array $ids)
      */
     protected function doSave(array $values, $lifetime)
     {
-        return array_keys(apcu_store($values, null, $lifetime));
+        try {
+            return array_keys(apcu_store($values, null, $lifetime));
+        } catch (\Error $e) {
+        } catch (\Exception $e) {
+        }
+
+        if (1 === count($values)) {
+            // Workaround https://github.com/krakjoe/apcu/issues/170
+            apcu_delete(key($values));
+        }
+
+        throw $e;
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -30,4 +30,17 @@ public function createCachePool()
 
         return new ApcuAdapter(str_replace('\\', '.', __CLASS__));
     }
+
+    public function testUnserializable()
+    {
+        $pool = $this->createCachePool();
+
+        $item = $pool->getItem('foo');
+        $item->set(function() {});
+
+        $this->assertFalse($pool->save($item));
+
+        $item = $pool->getItem('foo');
+        $this->assertFalse($item->isHit());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,17 @@ protected function doDelete(array $ids)`
`72`	`72`	`*/`
`73`	`73`	`protected function doSave(array $values, $lifetime)`
`74`	`74`	`{`
`75`		`- return array_keys(apcu_store($values, null, $lifetime));`
	`75`	`+ try {`
	`76`	`+ return array_keys(apcu_store($values, null, $lifetime));`
	`77`	`+ } catch (\Error $e) {`
	`78`	`+ } catch (\Exception $e) {`
	`79`	`+ }`
	`80`	`+`
	`81`	`+ if (1 === count($values)) {`
	`82`	`+ // Workaround https://github.com/krakjoe/apcu/issues/170`
	`83`	`+ apcu_delete(key($values));`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ throw $e;`
`76`	`87`	`}`
`77`	`88`	`}`