Merge pull request #97 from Xon/scan_fix

Fix scan behavior for multiple iterations for phpredis vs Credis, and update test

Author: colinmollenhour

Client.php

@@ -829,12 +829,12 @@ public function __call($name, $args)
                     }
                     break;
                 case 'scan':
-                    $ref =& $args[0];
-                    if (empty($ref))
+                    $trackedArgs = array(&$args[0]);
+                    if (empty($trackedArgs[0]))
                     {
-                        $ref = 0;
+                        $trackedArgs[0] = 0;
                     }
-                    $eArgs = array($ref);
+                    $eArgs = array($trackedArgs[0]);
                     if (!empty($args[1]))
                     {
                         $eArgs[] = 'MATCH';
@@ -850,12 +850,12 @@ public function __call($name, $args)
                 case 'sscan':
                 case 'zscan':
                 case 'hscan':
-					$ref =& $args[1];
-					if (empty($ref))
+					$trackedArgs = array(&$args[1]);
+					if (empty($trackedArgs[0]))
 					{
-						$ref = 0;
+ 						$trackedArgs[0] = 0;
 					}
-					$eArgs = array($args[0],$ref);
+					$eArgs = array($args[0],$trackedArgs[0]);
 					if (!empty($args[2]))
 					{
 						$eArgs[] = 'MATCH';
@@ -1300,7 +1300,7 @@ protected function read_reply($name = '', $returnQueued = false)
         return $response;
     }
 
-    protected function decode_reply($name, $response, array $arguments = array() )
+    protected function decode_reply($name, $response, array &$arguments = array() )
     {
         // Smooth over differences between phpredis and standalone response
         switch ($name)
@@ -1351,12 +1351,12 @@ protected function decode_reply($name, $response, array $arguments = array() )
 
             case 'scan':
             case 'sscan':
-                $ref = array_shift($response);
+                $arguments[0] = intval(array_shift($response));
                 $response = empty($response[0]) ? array() : $response[0];
                 break;
             case 'hscan':
             case 'zscan':
-                $ref = array_shift($response);
+                $arguments[0] = intval(array_shift($response));
                 $response = empty($response[0]) ? array() : $response[0];
                 if (!empty($response) && is_array($response))
                 {

tests/CredisTest.php

@@ -718,11 +718,30 @@ public function testZscan()
     }
     public function testscan()
     {
-        $this->credis->set('name','Jack');
-        $this->credis->set('age','33');
+        $seen = array();
+        for($i = 0; $i < 100; $i++)
+        {
+            $this->credis->set('name.' . $i, 'Jack');
+            $this->credis->set('age.' . $i, '33');
+        }
         $iterator = null;
-        $result = $this->credis->scan($iterator,'n*',10);
-        $this->assertEquals($iterator,0);
-        $this->assertEquals($result,['name']);
+        do
+        {
+            $result = $this->credis->scan($iterator, 'n*', 10);
+            if ($result === false)
+            {
+                $this->assertEquals($iterator, 0);
+                break;
+            }
+            else
+            {
+                foreach($result as $key)
+                {
+                    $seen[$key] = true;
+                }
+            }
+        }
+        while($iterator);
+        $this->assertEquals(count($seen), 100);
     }
 }