[Cache] Fix Memcached options handling

nicolas-grekas · nicolas-grekas · commit e2def5f774c9 · 2017-11-19T22:04:31.000+01:00
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -141,13 +141,14 @@ public static function createConnection($servers, array $options = array())
                 if (is_int($name)) {
                     continue;
                 }
+                unset($options[$name]);
+
                 if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) {
                     $value = constant('Memcached::'.$name.'_'.strtoupper($value));
                 }
-                $opt = constant('Memcached::OPT_'.$name);
-
-                unset($options[$name]);
-                $options[$opt] = $value;
+                if (defined('Memcached::OPT_'.$name)) {
+                    $options[constant('Memcached::OPT_'.$name)] = $value;
+                }
             }
             $client->setOptions($options);
 

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,14 @@ public static function createConnection($servers, array $options = array())`
`141`	`141`	`if (is_int($name)) {`
`142`	`142`	`continue;`
`143`	`143`	`}`
	`144`	`+ unset($options[$name]);`
	`145`	`+`
`144`	`146`	`if ('HASH' === $name \|\| 'SERIALIZER' === $name \|\| 'DISTRIBUTION' === $name) {`
`145`	`147`	`$value = constant('Memcached::'.$name.'_'.strtoupper($value));`
`146`	`148`	`}`
`147`		`- $opt = constant('Memcached::OPT_'.$name);`
`148`		`-`
`149`		`- unset($options[$name]);`
`150`		`- $options[$opt] = $value;`
	`149`	`+ if (defined('Memcached::OPT_'.$name)) {`
	`150`	`+ $options[constant('Memcached::OPT_'.$name)] = $value;`
	`151`	`+ }`
`151`	`152`	`}`
`152`	`153`	`$client->setOptions($options);`
`153`	`154`