Update tests (WIP)

Author: nikic

Zend/tests/bug43201.phpt

@@ -30,25 +30,37 @@ Warning: Undefined variable $ref in %s on line %d
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 
 Warning: Undefined variable $undef in %s on line %d
 
+Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
+
 Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
 ok

Zend/tests/bug64677.phpt

@@ -7,7 +7,7 @@ class cat {
     }
 }
 $cat = new cat();
-$cat->show_output('Files: ', trim(`cd .`)); // this gives invalid args to shell_exec
+$cat->show_output('Files: ', trim((string) `cd .`)); // this gives invalid args to shell_exec
 $cat->show_output('Files: ', `cd .`); // this causes a segmentation fault
 $cat->show_output(`cd .`); // this causes a segmentation fault
 

Zend/tests/class_exists_002.phpt

@@ -8,15 +8,13 @@ class foo {
 }
 
 var_dump(class_exists(''));
-var_dump(class_exists(NULL));
 var_dump(class_exists('FOO'));
 var_dump(class_exists('bar'));
 var_dump(class_exists(1));
 
 ?>
 --EXPECT--
 bool(false)
-bool(false)
 bool(true)
 bool(false)
 bool(false)

Zend/tests/exception_001.phpt

@@ -7,7 +7,7 @@ try {
     try {
         try {
             try {
-                throw new Exception(NULL);
+                throw new Exception();
             } catch (Exception $e) {
                 var_dump($e->getMessage());
                 throw $e;

Zend/tests/interface_exists_001.phpt

@@ -8,10 +8,8 @@ interface foo {
 
 var_dump(interface_exists('foo'));
 var_dump(interface_exists(1));
-var_dump(interface_exists(NULL));
 
 ?>
 --EXPECT--
 bool(true)
 bool(false)
-bool(false)

Zend/tests/nullsafe_operator/013.phpt

@@ -38,14 +38,21 @@ dump_error(fn() => array_key_exists('foo', $foo?->foo()));
 
 ?>
 --EXPECTF--
+Deprecated: {closure}(): Passing null to argument of type string is deprecated in %s on line %d
 int(0)
 bool(true)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
+
+Deprecated: defined(): Passing null to argument of type string is deprecated in %s on line %d
 bool(false)
+
+Deprecated: chr(): Passing null to argument of type int is deprecated in %s on line %d
 string(1) "%s"
+
+Deprecated: ord(): Passing null to argument of type string is deprecated in %s on line %d
 int(0)
 string(98) "call_user_func_array(): Argument #1 ($function) must be a valid callback, no array or string given"
 string(77) "call_user_func_array(): Argument #2 ($args) must be of type array, null given"
@@ -55,6 +62,8 @@ string(4) "NULL"
 string(52) "func_num_args() expects exactly 0 arguments, 1 given"
 string(52) "func_get_args() expects exactly 0 arguments, 1 given"
 string(69) "array_slice(): Argument #1 ($array) must be of type array, null given"
+
+Deprecated: array_slice(): Passing null to argument of type int is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(3) "foo"

Zend/tests/str_or_obj_of_class_zpp.phpt

@@ -51,9 +51,11 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 string(6) "string"
 string(1) "1"
+
+Deprecated: zend_string_or_stdclass(): Passing null to argument of type string is deprecated in %s on line %d
 string(0) ""
 object(stdClass)#1 (0) {
 }

Zend/tests/str_or_obj_zpp.phpt

@@ -34,9 +34,11 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 string(6) "string"
 string(1) "1"
+
+Deprecated: zend_string_or_object(): Passing null to argument of type string is deprecated in %s on line %d
 string(0) ""
 object(stdClass)#1 (0) {
 }

Zend/tests/trait_exists_001.phpt

@@ -8,10 +8,8 @@ trait foo {
 
 var_dump(trait_exists('foo'));
 var_dump(trait_exists(1));
-var_dump(trait_exists(NULL));
 
 ?>
 --EXPECT--
 bool(true)
 bool(false)
-bool(false)

ext/standard/tests/array/array_filter_variation9.phpt

@@ -8,7 +8,7 @@ Test array_filter() function : usage variations - built-in functions as 'callbac
 
 echo "*** Testing array_filter() : usage variations - built-in functions as 'callback' argument ***\n";
 
-$input = array(0, 1, -1, 10, 100, 1000, null);
+$input = array(0, 1, -1, 10, 100, 1000);
 
 // using built-in function 'is_int' as 'callback'
 var_dump( array_filter($input, 'is_int') );
@@ -48,7 +48,7 @@ array(6) {
   [5]=>
   int(1000)
 }
-array(7) {
+array(6) {
   [0]=>
   int(0)
   [1]=>
@@ -61,8 +61,6 @@ array(7) {
   int(100)
   [5]=>
   int(1000)
-  [6]=>
-  NULL
 }
 array_filter(): Argument #2 ($callback) must be a valid callback, function "echo" not found or invalid function name
 array_filter(): Argument #2 ($callback) must be a valid callback, function "exit" not found or invalid function name

ext/standard/tests/array/count_invalid_mode.phpt

@@ -12,7 +12,6 @@ $modes = [
     2,
     TRUE,
     FALSE,
-    NULL,
 ];
 
 foreach ($modes as $mode) {
@@ -32,4 +31,3 @@ 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)
-int(0)

ext/standard/tests/file/005_variation2.phpt

@@ -28,7 +28,6 @@ function stat_fn( $filename ) {
 
 echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n";
 echo "\n*** testing touch ***\n";
-$a = touch(NULL);
 $b = touch(false);
 $c = touch('');
 $d = touch(' ');
@@ -41,7 +40,6 @@ var_dump($d);
 var_dump($e);
 
 echo "\n*** testing file info ***";
-stat_fn(NULL);
 stat_fn(false);
 stat_fn('');
 stat_fn(' ');
@@ -56,7 +54,9 @@ echo "Done";
 *** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***
 
 *** testing touch ***
-bool(false)
+
+Warning: Undefined variable $a in %s on line %d
+NULL
 bool(false)
 bool(false)
 bool(true)
@@ -73,11 +73,6 @@ bool(true)
 -- File modification time is => 
 -- inode change time is => 
 
--- File '' --
--- File access time is => 
--- File modification time is => 
--- inode change time is => 
-
 -- File ' ' --
 -- File access time is => %d
 -- File modification time is => %d

ext/standard/tests/file/basename.phpt

@@ -56,7 +56,6 @@ $file_paths = array (
   /* empty paths */
   "",
   '',
-  NULL,
 );
 
 foreach ($file_paths as $file_path) {
@@ -98,4 +97,3 @@ string(1) " "
 string(1) " "
 string(0) ""
 string(0) ""
-string(0) ""

ext/standard/tests/file/basename_basic.phpt

@@ -3,15 +3,15 @@ Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includ
 --FILE--
 <?php
 
-$ini = parse_ini_string('ini="ini;raw"', null, INI_SCANNER_RAW);
+$ini = parse_ini_string('ini="ini;raw"', false, INI_SCANNER_RAW);
 var_dump($ini['ini']);
-$ini = parse_ini_string('ini="ini;raw', null, INI_SCANNER_RAW);
+$ini = parse_ini_string('ini="ini;raw', false, INI_SCANNER_RAW);
 var_dump($ini['ini']);
-$ini = parse_ini_string('ini=ini;raw', null, INI_SCANNER_RAW);
+$ini = parse_ini_string('ini=ini;raw', false, INI_SCANNER_RAW);
 var_dump($ini['ini']);
-$ini = parse_ini_string('ini=ini"raw', null, INI_SCANNER_RAW);
+$ini = parse_ini_string('ini=ini"raw', false, INI_SCANNER_RAW);
 var_dump($ini['ini']);
-$ini = parse_ini_string("ini=\r\niniraw", null, INI_SCANNER_RAW);
+$ini = parse_ini_string("ini=\r\niniraw", false, INI_SCANNER_RAW);
 var_dump($ini['ini']);
 ?>
 --EXPECT--

ext/standard/tests/file/bug51094.phpt

@@ -5,7 +5,7 @@ Bug #61961 (file_get_content leaks when access empty file with max length)
 $tmp_empty_file = __FILE__ . ".tmp";
 file_put_contents($tmp_empty_file, "");
 
-var_dump(file_get_contents($tmp_empty_file, NULL, NULL, NULL, 10));
+var_dump(file_get_contents($tmp_empty_file, false, NULL, 0, 10));
 unlink($tmp_empty_file);
 ?>
 --EXPECT--

ext/standard/tests/file/bug61961.phpt

@@ -8,7 +8,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 try {
-    chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", null);
+    chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", 0);
 } catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }

ext/standard/tests/file/chgrp.phpt

@@ -7,7 +7,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 ?>
 --FILE--
 <?php
-chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
+chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", 0);
 echo "ALIVE\n";
 ?>
 --EXPECTF--

ext/standard/tests/file/chown.phpt

@@ -27,23 +27,23 @@ try {
     echo $e->getMessage() . \PHP_EOL;
 }
 
-echo 'fgetcsv() with delimiter as NULL' . \PHP_EOL;
+echo 'fgetcsv() with delimiter as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, NULL, $enclosure) );
+    var_dump( fgetcsv($file_handle, $length, '', $enclosure) );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
-echo 'fgetcsv() with enclosure as NULL' . \PHP_EOL;
+echo 'fgetcsv() with enclosure as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, $delimiter, NULL) );
+    var_dump( fgetcsv($file_handle, $length, $delimiter, '') );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
 
-echo 'fgetcsv() with delimiter & enclosure as NULL' . \PHP_EOL;
+echo 'fgetcsv() with delimiter & enclosure as empty string' . \PHP_EOL;
 try {
-    var_dump( fgetcsv($file_handle, $length, NULL, NULL) );
+    var_dump( fgetcsv($file_handle, $length, '', '') );
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
@@ -53,9 +53,9 @@ fgetcsv() with negative length
 fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
 fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
 fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
-fgetcsv() with delimiter as NULL
+fgetcsv() with delimiter as empty string
 fgetcsv(): Argument #3 ($separator) must be a single character
-fgetcsv() with enclosure as NULL
+fgetcsv() with enclosure as empty string
 fgetcsv(): Argument #4 ($enclosure) must be a single character
-fgetcsv() with delimiter & enclosure as NULL
+fgetcsv() with delimiter & enclosure as empty string
 fgetcsv(): Argument #3 ($separator) must be a single character

ext/standard/tests/file/fgetcsv_error_conditions.phpt

@@ -6,7 +6,6 @@ Dave Kelsey <[email protected]>
 <?php
 echo "*** Testing file_exists() : usage variations ***\n";
 
-var_dump(file_exists(NULL));
 var_dump(file_exists(false));
 var_dump(file_exists(''));
 var_dump(file_exists(' '));
@@ -19,5 +18,4 @@ bool(false)
 bool(false)
 bool(false)
 bool(false)
-bool(false)
 Done

ext/standard/tests/file/file_exists_variation1.phpt

@@ -19,7 +19,6 @@ $names_arr = array(
   -1,
   TRUE,
   FALSE,
-  NULL,
   "",
   " ",
   "\0",
@@ -57,20 +56,18 @@ ValueError: Path cannot be empty
 -- Iteration 3 --
 ValueError: Path cannot be empty
 -- Iteration 4 --
-ValueError: Path cannot be empty
--- Iteration 5 --
 
 Warning: file_get_contents( ): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
--- Iteration 6 --
+-- Iteration 5 --
 ValueError: file_get_contents(): Argument #1 ($filename) must not contain any null bytes
--- Iteration 7 --
+-- Iteration 6 --
 TypeError: file_get_contents(): Argument #1 ($filename) must be of type string, array given
--- Iteration 8 --
+-- Iteration 7 --
 
 Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
--- Iteration 9 --
+-- Iteration 8 --
 
 Warning: file_get_contents(php/php): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

ext/standard/tests/file/file_get_contents_variation8.phpt

@@ -19,7 +19,7 @@ runtest();
 $newpath = "";
 set_include_path($newpath);
 runtest();
-set_include_path(null);
+set_include_path("");
 runtest();
 set_include_path(";;  ; ;c:\\rubbish");
 runtest();