minor #21268 [Cache] Relax binary-constraint on Memcached connections…

… (nicolas-grekas) This PR was merged into the 3.3-dev branch. Discussion ---------- [Cache] Relax binary-constraint on Memcached connections | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - If it's green then it's PSR-6 compliant. Commits ------- 284d363 [Cache] Relax binary-constraint on Memcached connections
symfony · Jan 14, 2017 · 42c3d4f · 42c3d4f
2 parents cc398db + 284d363
commit 42c3d4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -44,9 +44,6 @@ public function __construct(\Memcached $client, $namespace = '', $defaultLifetim
         if (\Memcached::SERIALIZER_PHP !== $opt && \Memcached::SERIALIZER_IGBINARY !== $opt) {
             throw new CacheException('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         }
-        if (!$client->getOption(\Memcached::OPT_BINARY_PROTOCOL)) {
-            throw new CacheException('MemcachedAdapter: "binary_protocol" option must be enabled.');
-        }
         $this->maxIdLength -= strlen($client->getOption(\Memcached::OPT_PREFIX_KEY));
 
         parent::__construct($namespace, $defaultLifetime);
@@ -67,7 +64,7 @@ public function __construct(\Memcached $client, $namespace = '', $defaultLifetim
      *
      * @return \Memcached
      *
-     * @throws \ErrorEception When invalid options or servers are provided.
+     * @throws \ErrorEception When invalid options or servers are provided
      */
     public static function createConnection($servers, array $options = array())
     {

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -29,7 +29,7 @@ public static function setupBeforeClass()
         if (!MemcachedAdapter::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
         }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'));
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
         self::$client->get('foo');
         $code = self::$client->getResultCode();
 
@@ -40,7 +40,9 @@ public static function setupBeforeClass()
 
     public function createCachePool($defaultLifetime = 0)
     {
-        return new MemcachedAdapter(self::$client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
+
+        return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
     public function testOptions()
@@ -80,15 +82,6 @@ public function provideBadOptions()
         );
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\CacheException
-     * @expectedExceptionMessage MemcachedAdapter: "binary_protocol" option must be enabled.
-     */
-    public function testBinaryProtocol()
-    {
-        new MemcachedAdapter(MemcachedAdapter::createConnection(array(), array('binary_protocol' => false)));
-    }
-
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedAdapter::isSupported());