symfony
diff --git a/‎src/Symfony/Component/Dsn/ConnectionFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/ConnectionFactory.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Dsn/ConnectionFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/ConnectionFactory.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Dsn/Exception/ExceptionInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Exception/ExceptionInterface.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Dsn/Exception/ExceptionInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Exception/ExceptionInterface.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Dsn/Factory/MemcachedConnectionFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Factory/MemcachedConnectionFactory.php
+14-3Lines changed: 14 additions & 3 deletions b/‎src/Symfony/Component/Dsn/Factory/MemcachedConnectionFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Factory/MemcachedConnectionFactory.php
+14-3Lines changed: 14 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Dsn/Tests/Factory/MemcachedConnectionFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Tests/Factory/MemcachedConnectionFactoryTest.php
-1Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/Dsn/Tests/Factory/MemcachedConnectionFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dsn/Tests/Factory/MemcachedConnectionFactoryTest.php
-1Lines changed: 0 additions & 1 deletion
@@ -22,13 +22,13 @@
  */
 class ConnectionFactory
 {
-    const TYPE_REDIS = 1;
-    const TYPE_MEMCACHED = 2;
+    const TYPE_REDIS = 'redis';
+    const TYPE_MEMCACHED = 'memcached';
 
     /**
      * @param string $dsn
      *
-     * @return int
+     * @return string
      */
     public static function getType($dsn)
     {
 
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Dsn\Exception;
 
 /**
- * Interface for exceptions.
+ * Base ExceptionInterface for the Dsn Component.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 
@@ -21,6 +21,7 @@
 class MemcachedConnectionFactory
 {
     private static $defaultClientOptions = array(
+        'class' => null,
         'persistent_id' => null,
         'username' => null,
         'password' => null,
@@ -44,7 +45,7 @@ class MemcachedConnectionFactory
      * @param string|string[] A DSN, or an array of DSNs
      * @param array           An array of options
      *
-     * @return \Memcached
+     * @return \Memcached According to the "class" option
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
@@ -53,12 +54,22 @@ public static function createConnection($dsns, array $options = array())
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
             $options += static::$defaultClientOptions;
-            $client = new \Memcached($options['persistent_id']);
+
+            $class = null === $options['class'] ? \Memcached::class : $options['class'];
+            unset($options['class']);
+            if (is_a($class, \Memcached::class, true)) {
+                $client = new \Memcached($options['persistent_id']);
+            } elseif (class_exists($class, false)) {
+                throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Memcached"', $class));
+            } else {
+                throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
+            }
+
             $username = $options['username'];
             $password = $options['password'];
 
             // parse any DSN in $dsns
-            $servers=[];
+            $servers = array();
             foreach ((array) $dsns as $dsn) {
                 if (0 !== strpos($dsn, 'memcached://')) {
                     throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $dsn));
 
@@ -77,7 +77,6 @@ public function testServersSetting($dsn, $host, $port)
         $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
         $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
         $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@`
`22`	`22`	`*/`
`23`	`23`	`class ConnectionFactory`
`24`	`24`	`{`
`25`		`- const TYPE_REDIS = 1;`
`26`		`- const TYPE_MEMCACHED = 2;`
	`25`	`+ const TYPE_REDIS = 'redis';`
	`26`	`+ const TYPE_MEMCACHED = 'memcached';`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @param string $dsn`
`30`	`30`	`*`
`31`		`- * @return int`
	`31`	`+ * @return string`
`32`	`32`	`*/`
`33`	`33`	`public static function getType($dsn)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Dsn\Exception;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * Interface for exceptions.`
	`15`	`+ * Base ExceptionInterface for the Dsn Component.`
`16`	`16`	`*`
`17`	`17`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`18`	`18`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ public function testServersSetting($dsn, $host, $port)`
`77`	`77`	`$f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };`
`78`	`78`	`$this->assertSame(array($expect), array_map($f, $client1->getServerList()));`
`79`	`79`	`$this->assertSame(array($expect), array_map($f, $client2->getServerList()));`
`80`		`- $this->assertSame(array($expect), array_map($f, $client3->getServerList()));`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`public function provideServersSetting()`