Merge pull request #1845 from phpredis/issue-php8test

yatsukhnenko · web-flow · commit 7e5191fb5645 · 2020-09-11T12:39:39.000+03:00
fix test suite for PHP 8
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -6102,9 +6102,15 @@ public function testInvalidAuthArgs() {
 
         foreach ($arr_args as $arr_arg) {
             try {
-                @call_user_func_array([$obj_new, 'auth'], $arr_arg);
+                if (is_array($arr_arg)) {
+                    @call_user_func_array([$obj_new, 'auth'], $arr_arg);
+                } else {
+                    call_user_func([$obj_new, 'auth']);
+                }
             } catch (Exception $ex) {
                 unset($ex); /* Suppress intellisense warning */
+            } catch (ArgumentCountError $ex) {
+                unset($ex); /* Suppress intellisense warning */
             }
         }
     }
diff --git a/tests/startSession.php b/tests/startSession.php
@@ -22,11 +22,11 @@
 ini_set('redis.session.lock_expire', $lock_expire);
 ini_set('session.gc_maxlifetime', $sessionLifetime);
 
-if (isset($argv[8])) {
+if (isset($argv[10])) {
     ini_set('redis.session.locking_enabled', $argv[10]);
 }
 
-if (isset($argv[9])) {
+if (isset($argv[11])) {
     ini_set('redis.session.lock_wait_time', $argv[11]);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6102,9 +6102,15 @@ public function testInvalidAuthArgs() {`
`6102`	`6102`
`6103`	`6103`	`foreach ($arr_args as $arr_arg) {`
`6104`	`6104`	`try {`
`6105`		`- @call_user_func_array([$obj_new, 'auth'], $arr_arg);`
	`6105`	`+ if (is_array($arr_arg)) {`
	`6106`	`+ @call_user_func_array([$obj_new, 'auth'], $arr_arg);`
	`6107`	`+ } else {`
	`6108`	`+ call_user_func([$obj_new, 'auth']);`
	`6109`	`+ }`
`6106`	`6110`	`} catch (Exception $ex) {`
`6107`	`6111`	`unset($ex); /* Suppress intellisense warning */`
	`6112`	`+ } catch (ArgumentCountError $ex) {`
	`6113`	`+ unset($ex); /* Suppress intellisense warning */`
`6108`	`6114`	`}`
`6109`	`6115`	`}`
`6110`	`6116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`ini_set('redis.session.lock_expire', $lock_expire);`
`23`	`23`	`ini_set('session.gc_maxlifetime', $sessionLifetime);`
`24`	`24`
`25`		`-if (isset($argv[8])) {`
	`25`	`+if (isset($argv[10])) {`
`26`	`26`	`ini_set('redis.session.locking_enabled', $argv[10]);`
`27`	`27`	`}`
`28`	`28`
`29`		`-if (isset($argv[9])) {`
	`29`	`+if (isset($argv[11])) {`
`30`	`30`	`ini_set('redis.session.lock_wait_time', $argv[11]);`
`31`	`31`	`}`
`32`	`32`