ext/standard/tests/array: Fix tests and remove ZPP tests

Author: Girgias

ext/standard/tests/array/array_column_scalar_index_weak_types.phpt

@@ -16,7 +16,7 @@ function dump($value, $key)
   echo "$key = $value\n";
 }
 
-var_dump( array_filter($input, 'dump', true) );
+var_dump( array_filter($input, 'dump', ARRAY_FILTER_USE_BOTH) );
 
 echo "*** Testing array_filter() : usage variations - 'callback' filters based on key value ***\n";
 
@@ -25,12 +25,12 @@ function dump2($value, $key)
   return $key > 4;
 }
 
-var_dump( array_filter($input, 'dump2', true) );
+var_dump( array_filter($input, 'dump2', ARRAY_FILTER_USE_BOTH) );
 
 echo "*** Testing array_filter() : usage variations - 'callback' expecting second argument ***\n";
 
 try {
-    var_dump( array_filter($small, 'dump', false) );
+    var_dump( array_filter($small, 'dump', 0) );
 } catch (Throwable $e) {
     echo "Exception: " . $e->getMessage() . "\n";
 }

ext/standard/tests/array/array_filter_variation10.phpt

@@ -3,29 +3,15 @@ Test array_slice() - Third parameter (NULL vs 0)
 --FILE--
 <?php
 
-var_dump(array_slice(range(1, 3), 0, NULL, 1));
-var_dump(array_slice(range(1, 3), 0, 0, 1));
+var_dump(array_slice(range(1, 3), 0, NULL, true));
+var_dump(array_slice(range(1, 3), 0, 0, true));
 var_dump(array_slice(range(1, 3), 0, NULL));
 var_dump(array_slice(range(1, 3), 0, 0));
 
 var_dump(array_slice(range(1, 3), -1, 0));
-var_dump(array_slice(range(1, 3), -1, 0, 1));
+var_dump(array_slice(range(1, 3), -1, 0, true));
 var_dump(array_slice(range(1, 3), -1, NULL));
-var_dump(array_slice(range(1, 3), -1, NULL, 1));
-
-
-$a = 'foo';
-try {
-    var_dump(array_slice(range(1, 3), 0, $a));
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-try {
-    var_dump(array_slice(range(1, 3), 0, $a));
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-var_dump($a);
+var_dump(array_slice(range(1, 3), -1, NULL, true));
 
 ?>
 --EXPECT--
@@ -61,6 +47,3 @@ array(1) {
   [2]=>
   int(3)
 }
-array_slice(): Argument #3 ($length) must be of type ?int, string given
-array_slice(): Argument #3 ($length) must be of type ?int, string given
-string(3) "foo"

ext/standard/tests/array/array_slice_variation1.phpt

@@ -10,8 +10,6 @@ $modes = [
     1,
     -1,
     2,
-    TRUE,
-    FALSE,
 ];
 
 foreach ($modes as $mode) {
@@ -29,5 +27,3 @@ int(0)
 int(0)
 count(): Argument #2 ($mode) must be either COUNT_NORMAL or COUNT_RECURSIVE
 count(): Argument #2 ($mode) must be either COUNT_NORMAL or COUNT_RECURSIVE
-int(0)
-int(0)