[Cache] Fallback to positional when keyed results are broken

nicolas-grekas · nicolas-grekas · commit 28aaa8eb05fd · 2017-06-05T16:53:36.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -266,6 +266,9 @@ private function generateItems($items, &$keys)
 
         try {
             foreach ($items as $id => $value) {
+                if (!isset($keys[$id])) {
+                    $id = key($keys);
+                }
                 $key = $keys[$id];
                 unset($keys[$id]);
                 yield $key => $f($key, $value, true);
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -19,6 +19,18 @@ class MemcachedAdapter extends AbstractAdapter
 
     protected $maxIdLength = 250;
 
+    /**
+     * Constructor.
+     *
+     * Using a MemcachedAdapter with a TagAwareAdapter for storing tags is discouraged.
+     * Using a RedisAdapter is recommended instead. If you cannot do otherwise, be aware that:
+     * - the Memcached::OPT_BINARY_PROTOCOL must be enabled
+     *   (that's the default when using MemcachedAdapter::createConnection());
+     * - tags eviction by Memcached's LRU algorithm will break by-tags invalidation;
+     *   your Memcached memory should be large enough to never trigger LRU.
+     *
+     * Using a MemcachedAdapter as a pure items store is fine.
+     */
     public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
     {
         $this->init($client, $namespace, $defaultLifetime);
diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php
@@ -162,6 +162,9 @@ private function generateValues($values, &$keys, $default)
     {
         try {
             foreach ($values as $id => $value) {
+                if (!isset($keys[$id])) {
+                    $id = key($keys);
+                }
                 $key = $keys[$id];
                 unset($keys[$id]);
                 yield $key => $value;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
@@ -15,6 +15,9 @@
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
 
+/**
+ * @group time-sensitive
+ */
 class TraceableTagAwareAdapterTest extends TraceableAdapterTest
 {
     public function testInvalidateTags()
diff --git a/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php b/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php
@@ -15,6 +15,15 @@
 
 abstract class CacheTestCase extends SimpleCacheTest
 {
+    public static function validKeys()
+    {
+        if (defined('HHVM_VERSION')) {
+            return parent::validKeys();
+        }
+
+        return array_merge(parent::validKeys(), array(array("a\0b")));
+    }
+
     public function testDefaultLifeTime()
     {
         if (isset($this->skippedTests[__FUNCTION__])) {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`use Symfony\Component\Cache\Adapter\TagAwareAdapter;`
`16`	`16`	`use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * @group time-sensitive`
	`20`	`+ */`
`18`	`21`	`class TraceableTagAwareAdapterTest extends TraceableAdapterTest`
`19`	`22`	`{`
`20`	`23`	`public function testInvalidateTags()`