Procházet zdrojové kódy

Reverting some obsoleted changes in preparation for a merge into the master branch.

Daniele Alessandri před 15 roky
rodič
revize
d8b0c7f40c
1 změnil soubory, kde provedl 2 přidání a 18 odebrání
  1. 2 18
      lib/Predis.php

+ 2 - 18
lib/Predis.php

@@ -85,10 +85,6 @@ class Client {
         return $this->_serverProfile;
         return $this->_serverProfile;
     }
     }
 
 
-    public function useMultiBulkIterator($value = true) {
-        Response::useMultiBulkIterator($value);
-    }
-
     public function connect() {
     public function connect() {
         $this->_connection->connect();
         $this->_connection->connect();
     }
     }
@@ -370,7 +366,7 @@ class Response {
     const QUEUED  = 'QUEUED';
     const QUEUED  = 'QUEUED';
     const NULL    = 'nil';
     const NULL    = 'nil';
 
 
-    private static $_prefixHandlers, $_useMultiBulkIterator;
+    private static $_prefixHandlers;
 
 
     private static function initializePrefixHandlers() {
     private static function initializePrefixHandlers() {
         return array(
         return array(
@@ -378,22 +374,10 @@ class Response {
             '-' => new ResponseErrorHandler(), 
             '-' => new ResponseErrorHandler(), 
             ':' => new ResponseIntegerHandler(), 
             ':' => new ResponseIntegerHandler(), 
             '$' => new ResponseBulkHandler(), 
             '$' => new ResponseBulkHandler(), 
-            '*' => self::$_useMultiBulkIterator
-                    ? new ResponseMultiBulkStreamHandler()
-                    : new ResponseMultiBulkHandler()
+            '*' => new ResponseMultiBulkHandler(), 
         );
         );
     }
     }
 
 
-    public static function useMultiBulkIterator($value = null) {
-        if (is_bool($value)) {
-            self::$_useMultiBulkIterator = $value;
-            self::$_prefixHandlers = self::initializePrefixHandlers();
-        }
-        else {
-            return self::$_useMultiBulkIterator;
-        }
-    }
-
     public static function read($socket) {
     public static function read($socket) {
         $header  = fgets($socket);
         $header  = fgets($socket);
         if ($header === false) {
         if ($header === false) {