Some windows test fixes

nikic · nikic · commit ce04773da23e · 2021-02-11T15:01:47.000+01:00
diff --git a/ext/odbc/tests/odbc_columnprivileges_001.phpt b/ext/odbc/tests/odbc_columnprivileges_001.phpt
@@ -22,6 +22,12 @@ var_dump(odbc_fetch_row($result));
 --EXPECTF--
 resource(%d) of type (odbc result)
 bool(false)
+
+Deprecated: odbc_columnprivileges(): Passing null to parameter #3 ($schema) of type string is deprecated in %s on line %d
+
+Deprecated: odbc_columnprivileges(): Passing null to parameter #4 ($table) of type string is deprecated in %s on line %d
+
+Deprecated: odbc_columnprivileges(): Passing null to parameter #5 ($column) of type string is deprecated in %s on line %d
 resource(%d) of type (odbc result)
 bool(false)
 resource(%d) of type (odbc result)
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -11,10 +11,10 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-var_dump(socket_create_pair(AF_INET, null, null, $sockets));
+var_dump(socket_create_pair(AF_INET, 0, 0, $sockets));
 
 try {
-    var_dump(socket_create_pair(31337, null, null, $sockets));
+    var_dump(socket_create_pair(31337, 0, 0, $sockets));
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt
@@ -28,7 +28,6 @@ function stat_fn( $filename ) {
 
 echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n";
 echo "\n*** testing file info ***";
-stat_fn(NULL);
 stat_fn(false);
 stat_fn('');
 stat_fn(' ');
@@ -59,11 +58,6 @@ echo "Done";
 -- 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 => 
 Warning: fileatime(): stat failed for   in %s on line %d
diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt
@@ -56,13 +56,11 @@ $file_path_variations = array (
   /* paths with shortcut home dir char, with suffix variation */
   array("C:\\temp\\bar"),
   array("C:\\temp\\bar", ""),
-  array("C:\\temp\\bar", NULL),
   array("C:\\temp\\bar", ' '),
   array("C:\\temp\\bar.tar", ".tar"),
   array("C:\\temp\\bar.tar", "~"),
   array("C:\\temp\\bar.tar\\", "~"),
   array("C:\\temp\\bar.tar\\", ""),
-  array("C:\\temp\\bar.tar", NULL),
   array("C:\\temp\\bar.tar", ''),
   array("C:\\temp\\bar.tar", " "),
 
@@ -84,7 +82,6 @@ $file_path_variations = array (
   array("\\bar.zip\\", "\\bar.zip\\"),
   array(" ", " "),
   array(' ', ' '),
-  array(NULL, NULL),
 
   /* path with spaces */
   array(" "),
@@ -93,7 +90,6 @@ $file_path_variations = array (
   /* empty paths */
   array(""),
   array(''),
-  array(NULL)
 );
 
 function check_basename( $path_arrays ) {
@@ -288,7 +284,4 @@ string(0) ""
 
 --Iteration 31--
 string(0) ""
-
---Iteration 32--
-string(0) ""
 Done
diff --git a/ext/standard/tests/file/basename_basic-win32.phpt b/ext/standard/tests/file/basename_basic-win32.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) ""
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
@@ -20,7 +20,6 @@ $names_arr = array(
   "-1" => -1,
   "TRUE" => TRUE,
   "FALSE" => FALSE,
-  "NULL" => NULL,
   "\"\"" => "",
   "\" \"" => " ",
   "\\0" => "\0",
@@ -58,9 +57,6 @@ bool(false)
 -- Filename: FALSE --
 ValueError: Path cannot be empty
 
--- Filename: NULL --
-ValueError: Path cannot be empty
-
 -- Filename: "" --
 ValueError: Path cannot be empty
 
diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
@@ -18,7 +18,6 @@ $names_arr = array(
   "-1" => -1,
   "TRUE" => TRUE,
   "FALSE" => FALSE,
-  "NULL" => NULL,
   "\"\"" => "",
   "\" \"" => " ",
   "\\0" => "\0",
@@ -58,9 +57,6 @@ foreach($names_arr as $key =>$value) {
 -- Filename: FALSE --
 ValueError: Path cannot be empty
 
--- Filename: NULL --
-ValueError: Path cannot be empty
-
 -- Filename: "" --
 ValueError: Path cannot be empty
 
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -19,7 +19,6 @@ $names_arr = array(
   "-1" => -1,
   "TRUE" => TRUE,
   "FALSE" => FALSE,
-  "NULL" => NULL,
   "\"\"" => "",
   "\" \"" => " ",
   "\\0" => "\0",
@@ -54,9 +53,6 @@ Warning: readfile(1): Failed to open stream: No such file or directory in %s on
 -- Filename: FALSE --
 ValueError: Path cannot be empty
 
--- Filename: NULL --
-ValueError: Path cannot be empty
-
 -- Filename: "" --
 ValueError: Path cannot be empty
 
diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt
@@ -51,8 +51,6 @@ $file_string = array (
   /* empty filename */
   "",
   '',
-  NULL,
-  null
  );
 for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) {
   echo "-- Iteration";
@@ -91,8 +89,4 @@ bool(false)
 string(%d) "%s"
 -- Iteration4 --
 string(%d) "%s"
--- Iteration5 --
-string(%d) "%s"
--- Iteration6 --
-string(%d) "%s"
 Done
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
@@ -17,7 +17,6 @@ $names_arr = array(
   -1, /* -1 is just a valid filename on windows */
   TRUE, /* 1 as well, (string)TRUE > "1" */
   FALSE,
-  NULL,
   "", // I think both p8 and php are wrong on the messages here
   //p8 generates different messages to php, php is probably wrong
   //php has either "File Exists" or "Permission Denied".
@@ -80,35 +79,28 @@ bool(false)
 
 Warning: rename(,%safile.tmp): %r(Invalid argument|(The parameter is incorrect|The system cannot find the path specified) \(code: \d+\))%r in %srename_variation13-win32.php on line %d
 bool(false)
--- 3 testing '' NULL --
+-- 3 testing '' string --
 
 Warning: rename(%safile.tmp,): %r(Invalid argument|(The parameter is incorrect|The system cannot find the path specified) \(code: \d+\))%r in %srename_variation13-win32.php on line %d
 bool(false)
 
 Warning: rename(,%safile.tmp): %r(Invalid argument|(The parameter is incorrect|The system cannot find the path specified) \(code: \d+\))%r in %srename_variation13-win32.php on line %d
 bool(false)
--- 4 testing '' string --
-
-Warning: rename(%safile.tmp,): %r(Invalid argument|(The parameter is incorrect|The system cannot find the path specified) \(code: \d+\))%r in %srename_variation13-win32.php on line %d
-bool(false)
-
-Warning: rename(,%safile.tmp): %r(Invalid argument|(The parameter is incorrect|The system cannot find the path specified) \(code: \d+\))%r in %srename_variation13-win32.php on line %d
-bool(false)
--- 5 testing ' ' string --
+-- 4 testing ' ' string --
 
 Warning: rename(%s): The filename, directory name, or volume label syntax is incorrect (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)
 
 Warning: rename(%s): The filename, directory name, or volume label syntax is incorrect (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)
--- 6 testing '/no/such/file/dir' string --
+-- 5 testing '/no/such/file/dir' string --
 
 Warning: rename(%safile.tmp,/no/such/file/dir): The system cannot find the path specified (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)
 
 Warning: rename(/no/such/file/dir,%safile.tmp): The system cannot find the path specified (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)
--- 7 testing 'php/php' string --
+-- 6 testing 'php/php' string --
 
 Warning: rename(%safile.tmp,php/php): The system cannot find the path specified (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)
diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -26,7 +26,6 @@ $names_arr = array(
     -1,
     TRUE,
     FALSE,
-    NULL,
     "",
     " ",
     "\0",
@@ -47,7 +46,6 @@ $res_arr = array(
     true,
     true,
     true,
-    true,
     false,
 
     /* prefix with path separator of a non existing directory*/
@@ -99,17 +97,15 @@ OK
 -- Iteration 3 --
 OK
 -- Iteration 4 --
-OK
--- Iteration 5 --
 
 Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation3-win32.php on line %d
 Failed, not created in the correct directory %s vs %s
 0
--- Iteration 6 --
+-- Iteration 5 --
 tempnam(): Argument #2 ($prefix) must not contain any null bytes
--- Iteration 7 --
+-- Iteration 6 --
 tempnam(): Argument #2 ($prefix) must be of type string, array given
--- Iteration 8 --
+-- Iteration 7 --
 OK
--- Iteration 9 --
+-- Iteration 8 --
 OK
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -19,7 +19,6 @@ $names_arr = array(
     -1,
     TRUE,
     FALSE,
-    NULL,
     "",
     " ",
     "\0",
@@ -86,26 +85,22 @@ File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
 -- Iteration 4 --
-File name is => %s%et%s
-File permissions are => 100666
-File created in => temp dir
--- Iteration 5 --
 
 Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d
 File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
--- Iteration 6 --
+-- Iteration 5 --
 tempnam(): Argument #1 ($directory) must not contain any null bytes
--- Iteration 7 --
+-- Iteration 6 --
 tempnam(): Argument #1 ($directory) must be of type string, array given
--- Iteration 8 --
+-- Iteration 7 --
 
 Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d
 File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
--- Iteration 9 --
+-- Iteration 8 --
 
 Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d
 File name is => %s%et%s
diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@ -27,9 +27,6 @@ echo "\n-- Testing unlink() on invalid arguments --\n";
 var_dump( unlink('') );  // $filename as empty string
 var_dump( file_exists('') );  // confirm file doesn't exist
 
-var_dump( unlink(NULL) );  // $filename as NULL
-var_dump( file_exists(NULL) );  // confirm file doesn't exist
-
 var_dump( unlink(false) );  // $filename as boolean false
 var_dump( file_exists(false) );  // confirm file doesn't exist
 
@@ -66,10 +63,6 @@ Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 
-Warning: unlink(): %s in %s on line %d
-bool(false)
-bool(false)
-
 -- Testing unlink() on non-existent file --
 
 Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d
diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt
@@ -25,9 +25,6 @@ echo "\n-- Testing unlink() on invalid arguments --\n";
 var_dump( unlink('') );  // $filename as empty string
 var_dump( file_exists('') );  // confirm file doesn't exist
 
-var_dump( unlink(NULL) );  // $filename as NULL
-var_dump( file_exists(NULL) );  // confirm file doesn't exist
-
 var_dump( unlink(false) );  // $filename as boolean false
 var_dump( file_exists(false) );  // confirm file doesn't exist
 
@@ -63,10 +60,6 @@ Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 
-Warning: unlink(): %s in %s on line %d
-bool(false)
-bool(false)
-
 -- Testing unlink() on non-existent file --
 
 Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt
@@ -17,7 +17,7 @@ $d = $base . '\\dev\\http\\tproj\\app\\cache\\dev_old\\annotations\\72';
 $foo = $d . '\\5b53796d666f6e795c42756e646c655c5477696742756e646c655c436f6e74726f6c6c65725c457863657074696f6e436f6e74726f6c6c657223676574416e64436c65616e4f7574707574427566666572696e67405b416e6e6f745d5d5b.doctrinecache.data';
 $bar = $d . '\\5b53796d666f6e795c42756e646c655c5477696742756e646c655c436f6e74726f6c6c65725c457863657074696f6e436f6e74726f6c6c657223676574416e64436c65616e4f7574707574427566666572696e67405b416e6e6f745d5d5b315d.doctrinecache.data';
 
-mkdir($d, NULL, true);
+mkdir($d, 0777, true);
 
 foreach (array($foo, $bar) as $f) {
     touch($f);
diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt
diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt
