Fix windows tests

iluuu1994 · iluuu1994 · commit 4124d400ebf9 · 2021-06-28T12:30:12.000+02:00
diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt
@@ -13,14 +13,17 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 
 function stat_fn( $filename ) {
   echo "\n-- File '$filename' --\n";
+  $result = fileatime($filename);
   echo "-- File access time is => ";
-  echo fileatime($filename)."\n";
+  echo $result."\n";
   clearstatcache();
+  $result = filemtime($filename);
   echo "-- File modification time is => ";
-  echo filemtime($filename)."\n";
+  echo $result."\n";
   clearstatcache();
+  $result = filectime($filename);
   echo "-- inode change time is => ";
-  echo filectime($filename)."\n";
+  echo $result."\n";
   clearstatcache();
 
 
@@ -48,8 +51,14 @@ echo "Done";
 
 *** testing file info ***
 -- File '' --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 -- File access time is => 
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 -- File modification time is => 
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 -- inode change time is => 
 
 -- File '' --
@@ -80,6 +89,8 @@ Warning: filectime(): stat failed for | in %s on line %d
 
 
 *** testing touch ***
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 bool(false)
 bool(false)
 
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
@@ -51,10 +51,14 @@ bool(false)
 
 -- Filename: TRUE --
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
 -- Filename: FALSE --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 ValueError: Path cannot be empty
 
 -- Filename: "" --
diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
@@ -52,9 +52,13 @@ foreach($names_arr as $key =>$value) {
 9 bytes written to: '-1'
 
 -- Filename: TRUE --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 9 bytes written to: '1'
 
 -- Filename: FALSE --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 ValueError: Path cannot be empty
 
 -- Filename: "" --
diff --git a/ext/standard/tests/file/glob_variation-win32-mb.phpt b/ext/standard/tests/file/glob_variation-win32-mb.phpt
@@ -381,18 +381,30 @@ array(0) {
 }
 
 -- Iteration 12 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(%d) "1"
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
 
@@ -446,6 +458,8 @@ array(1) {
   string(%d) "%s/glob_variation私はガラスを食べられます/wonder1"
 }
 -- Iteration 12 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
 Done
diff --git a/ext/standard/tests/file/glob_variation-win32.phpt b/ext/standard/tests/file/glob_variation-win32.phpt
@@ -380,18 +380,30 @@ array(0) {
 }
 
 -- Iteration 12 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(%d) "1"
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
 
@@ -445,6 +457,8 @@ array(1) {
   string(%d) "%s/glob_variation/wonder1"
 }
 -- Iteration 12 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 array(0) {
 }
 Done
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -48,9 +48,13 @@ Warning: readfile(-1): Failed to open stream: No such file or directory in %s on
 
 -- Filename: TRUE --
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 Warning: readfile(1): Failed to open stream: No such file or directory in %s on line %d
 
 -- Filename: FALSE --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 ValueError: Path cannot be empty
 
 -- Filename: "" --
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
@@ -68,15 +68,27 @@ bool(true)
 Warning: rename(-1,%safile.tmp): The system cannot find the file specified (code: 2) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 1 testing '1' boolean --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 bool(true)
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 Warning: rename(1,%safile.tmp): The system cannot find the file specified (code: 2) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 2 testing '' boolean --
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 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)
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 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 '' string --
diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -91,8 +91,12 @@ rmdir($file_path);
 -- Iteration 0 --
 OK
 -- Iteration 1 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 OK
 -- Iteration 2 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 OK
 -- Iteration 3 --
 OK
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -72,11 +72,15 @@ File permissions are => 100666
 File created in => temp dir
 -- Iteration 1 --
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 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 2 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@ -59,8 +59,12 @@ Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 Warning: unlink(): %s in %s on line %d
 bool(false)
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 bool(false)
 
 -- Testing unlink() on non-existent file --
diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt
@@ -56,8 +56,12 @@ Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
+
 Warning: unlink(): %s in %s on line %d
 bool(false)
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 bool(false)
 
 -- Testing unlink() on non-existent file --
diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
@@ -89,15 +89,23 @@ string(12) ""0.01234567""
 string(5) ""0.5""
 
 -- Iteration 11 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(3) ""1""
 
 -- Iteration 12 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(2) """"
 
 -- Iteration 13 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(3) ""1""
 
 -- Iteration 14 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(2) """"
 
 -- Iteration 15 --
diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt
@@ -330,9 +330,13 @@ string(31) "$$$$$$!!!!@@@@@@@ abcdef !!!***"
 string(13) "abcd%0abcdabcd"
 
 -- Iteration 6 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(1) "1"
 
 -- Iteration 7 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(0) ""
 
 *** Testing strtolower() with two different case strings ***
diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt
@@ -332,9 +332,13 @@ string(31) "$$$$$$!!!!@@@@@@@ ABCDEF !!!***"
 string(13) "ABCD%0ABCDABCD"
 
 -- Iteration 6 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(1) "1"
 
 -- Iteration 7 --
+
+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d
 string(0) ""
 
 *** Testing strtoupper() with two different case strings ***
diff --git a/run-tests.php b/run-tests.php
@@ -2759,7 +2759,7 @@ function run_test(string $php, $file, array $env): string
         if (strpos($log_format, 'S') !== false) {
             $env_lines = [];
             foreach ($env as $env_var => $env_val) {
-                $env_lines[] = "export $env_var=" . (string) escapeshellarg($env_val ?? "");
+                $env_lines[] = "export $env_var=" . escapeshellarg((string) ($env_val ?? ""));
             }
             $exported_environment = $env_lines ? "\n" . implode("\n", $env_lines) . "\n" : "";
             $sh_script = <<<SH

Original file line number	Diff line number	Diff line change
`@@ -381,18 +381,30 @@ array(0) {`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`-- Iteration 12 --`
	`384`	`+`
	`385`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`384`	`386`	`array(0) {`
`385`	`387`	`}`
	`388`	`+`
	`389`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`386`	`390`	`array(0) {`
`387`	`391`	`}`
	`392`	`+`
	`393`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`388`	`394`	`array(0) {`
`389`	`395`	`}`
	`396`	`+`
	`397`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`390`	`398`	`array(1) {`
`391`	`399`	`[0]=>`
`392`	`400`	`string(%d) "1"`
`393`	`401`	`}`
	`402`	`+`
	`403`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`394`	`404`	`array(0) {`
`395`	`405`	`}`
	`406`	`+`
	`407`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`396`	`408`	`array(0) {`
`397`	`409`	`}`
`398`	`410`
`@@ -446,6 +458,8 @@ array(1) {`
`446`	`458`	`string(%d) "%s/glob_variation私はガラスを食べられます/wonder1"`
`447`	`459`	`}`
`448`	`460`	`-- Iteration 12 --`
	`461`	`+`
	`462`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`449`	`463`	`array(0) {`
`450`	`464`	`}`
`451`	`465`	`Done`
Original file line number	Diff line number	Diff line change
`@@ -380,18 +380,30 @@ array(0) {`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`-- Iteration 12 --`
	`383`	`+`
	`384`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`383`	`385`	`array(0) {`
`384`	`386`	`}`
	`387`	`+`
	`388`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`385`	`389`	`array(0) {`
`386`	`390`	`}`
	`391`	`+`
	`392`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`387`	`393`	`array(0) {`
`388`	`394`	`}`
	`395`	`+`
	`396`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`389`	`397`	`array(1) {`
`390`	`398`	`[0]=>`
`391`	`399`	`string(%d) "1"`
`392`	`400`	`}`
	`401`	`+`
	`402`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`393`	`403`	`array(0) {`
`394`	`404`	`}`
	`405`	`+`
	`406`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`395`	`407`	`array(0) {`
`396`	`408`	`}`
`397`	`409`
`@@ -445,6 +457,8 @@ array(1) {`
`445`	`457`	`string(%d) "%s/glob_variation/wonder1"`
`446`	`458`	`}`
`447`	`459`	`-- Iteration 12 --`
	`460`	`+`
	`461`	`+Deprecated: Implicit bool to string coercion is deprecated in %s on line %d`
`448`	`462`	`array(0) {`
`449`	`463`	`}`
`450`	`464`	`Done`