فهرست منبع

Leverage the global connection creator facility to alias the 'redis' scheme to the 'tcp' scheme.

Daniele Alessandri 15 سال پیش
والد
کامیت
66a0458018
1فایلهای تغییر یافته به همراه5 افزوده شده و 7 حذف شده
  1. 5 7
      lib/Predis.php

+ 5 - 7
lib/Predis.php

@@ -1048,11 +1048,6 @@ class ConnectionParameters {
     }
     }
 
 
     private static function filterConnectionParams($parameters) {
     private static function filterConnectionParams($parameters) {
-        // for compatibility with older versions of Predis
-        if (isset($parameters['scheme']) && $parameters['scheme'] === 'redis') {
-            $parameters['scheme'] = 'tcp';
-        }
-
         return array(
         return array(
             'scheme' => self::getParamOrDefault($parameters, 'scheme', self::DEFAULT_SCHEME), 
             'scheme' => self::getParamOrDefault($parameters, 'scheme', self::DEFAULT_SCHEME), 
             'host' => self::getParamOrDefault($parameters, 'host', self::DEFAULT_HOST), 
             'host' => self::getParamOrDefault($parameters, 'host', self::DEFAULT_HOST), 
@@ -1108,7 +1103,10 @@ class Connection {
 
 
     private static function getDefaultSchemes() {
     private static function getDefaultSchemes() {
         return array(
         return array(
-            'tcp' => '\Predis\TcpConnection',
+            'tcp'   => '\Predis\TcpConnection',
+
+            // used for compatibility with older versions of Predis
+            'redis' => '\Predis\TcpConnection',
         );
         );
     }
     }
 
 
@@ -1149,7 +1147,7 @@ class TcpConnection implements IConnectionSingle {
     }
     }
 
 
     private function checkParameters(ConnectionParameters $parameters) {
     private function checkParameters(ConnectionParameters $parameters) {
-        if ($parameters->scheme != 'tcp') {
+        if ($parameters->scheme != 'tcp' && $parameters->scheme != 'redis') {
             throw new \InvalidArgumentException("Invalid scheme: {$parameters->scheme}");
             throw new \InvalidArgumentException("Invalid scheme: {$parameters->scheme}");
         }
         }
         return $parameters;
         return $parameters;