windows

Author: nikic

ext/standard/tests/file/file_get_contents_variation8-win32.phpt

@@ -70,10 +70,10 @@ Warning: file_get_contents( ): Failed to open stream: Permission denied in %s on
 bool(false)
 
 -- Filename: \0 --
-TypeError: file_get_contents(): Argument #1 ($filename) must be a valid path, string given
+ValueError: file_get_contents(): Argument #1 ($filename) must not contain any null bytes
 
 -- Filename: array() --
-TypeError: file_get_contents(): Argument #1 ($filename) must be a valid path, array given
+TypeError: file_get_contents(): Argument #1 ($filename) must be of type string, array given
 
 -- Filename: /no/such/file/dir --
 

ext/standard/tests/file/file_put_contents_variation8-win32.phpt

@@ -70,10 +70,10 @@ Warning: file_put_contents( ): Failed to open stream: Permission denied in %s on
 Failed to write data to: " "
 
 -- Filename: \0 --
-TypeError: file_put_contents(): Argument #1 ($filename) must be a valid path, string given
+ValueError: file_put_contents(): Argument #1 ($filename) must not contain any null bytes
 
 -- Filename: array() --
-TypeError: file_put_contents(): Argument #1 ($filename) must be a valid path, array given
+TypeError: file_put_contents(): Argument #1 ($filename) must be of type string, array given
 
 -- Filename: /no/such/file/dir --
 

ext/standard/tests/file/glob_variation-win32-mb.phpt

@@ -49,7 +49,7 @@ foreach($patterns as $pattern) {
     var_dump( glob($pattern, GLOB_NOCHECK) );
     var_dump( glob($pattern, GLOB_NOESCAPE) );
     var_dump( glob($pattern, GLOB_ERR) );
-  } catch (TypeError $e) {
+  } catch (Error $e) {
     echo $e->getMessage(), "\n";
   }
   $counter++;
@@ -75,7 +75,7 @@ foreach($patterns as $pattern) {
   echo "-- Iteration $counter --\n";
   try {
     var_dump( glob($pattern, GLOB_ONLYDIR) );
-  } catch (TypeError $e) {
+  } catch (Error $e) {
     echo $e->getMessage(), "\n";
   }
   $counter++;
@@ -330,7 +330,7 @@ array(0) {
 }
 
 -- Iteration 8 --
-glob(): Argument #1 ($pattern) must be a valid path, string given
+glob(): Argument #1 ($pattern) must not contain any null bytes
 
 -- Iteration 9 --
 array(0) {
@@ -433,7 +433,7 @@ array(1) {
 array(0) {
 }
 -- Iteration 8 --
-glob(): Argument #1 ($pattern) must be a valid path, string given
+glob(): Argument #1 ($pattern) must not contain any null bytes
 -- Iteration 9 --
 array(0) {
 }

ext/standard/tests/file/glob_variation-win32.phpt

@@ -48,7 +48,7 @@ foreach($patterns as $pattern) {
     var_dump( glob($pattern, GLOB_NOCHECK) );
     var_dump( glob($pattern, GLOB_NOESCAPE) );
     var_dump( glob($pattern, GLOB_ERR) );
-  } catch (TypeError $e) {
+  } catch (Error $e) {
     echo $e->getMessage(), "\n";
   }
   $counter++;
@@ -74,7 +74,7 @@ foreach($patterns as $pattern) {
   echo "-- Iteration $counter --\n";
   try {
     var_dump( glob($pattern, GLOB_ONLYDIR) );
-  } catch (TypeError $e) {
+  } catch (Error $e) {
     echo $e->getMessage(), "\n";
   }
   $counter++;
@@ -329,7 +329,7 @@ array(0) {
 }
 
 -- Iteration 8 --
-glob(): Argument #1 ($pattern) must be a valid path, string given
+glob(): Argument #1 ($pattern) must not contain any null bytes
 
 -- Iteration 9 --
 array(0) {
@@ -432,7 +432,7 @@ array(1) {
 array(0) {
 }
 -- Iteration 8 --
-glob(): Argument #1 ($pattern) must be a valid path, string given
+glob(): Argument #1 ($pattern) must not contain any null bytes
 -- Iteration 9 --
 array(0) {
 }

ext/standard/tests/file/readfile_variation10-win32.phpt

@@ -65,10 +65,10 @@ ValueError: Path cannot be empty
 Warning: readfile( ): Failed to open stream: Permission denied in %s on line %d
 
 -- Filename: \0 --
-TypeError: readfile(): Argument #1 ($filename) must be a valid path, string given
+ValueError: readfile(): Argument #1 ($filename) must not contain any null bytes
 
 -- Filename: array() --
-TypeError: readfile(): Argument #1 ($filename) must be a valid path, array given
+TypeError: readfile(): Argument #1 ($filename) must be of type string, array given
 
 -- Filename: /no/such/file/dir --
 

ext/standard/tests/file/tempnam_variation3-win32.phpt

@@ -59,7 +59,7 @@ for( $i=0; $i<count($names_arr); $i++ ) {
     echo "-- Iteration $i --\n";
     try {
         $file_name = tempnam($file_path, $names_arr[$i]);
-    } catch (TypeError $e) {
+    } catch (Error $e) {
         echo $e->getMessage(), "\n";
         continue;
     }
@@ -106,9 +106,9 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
 Failed, not created in the correct directory %s vs %s
 0
 -- Iteration 6 --
-tempnam(): Argument #2 ($prefix) must be a valid path, string given
+tempnam(): Argument #2 ($prefix) must not contain any null bytes
 -- Iteration 7 --
-tempnam(): Argument #2 ($prefix) must be a valid path, array given
+tempnam(): Argument #2 ($prefix) must be of type string, array given
 -- Iteration 8 --
 OK
 -- Iteration 9 --

ext/standard/tests/file/tempnam_variation7-win32.phpt

@@ -34,7 +34,7 @@ for( $i=0; $i<count($names_arr); $i++ ) {
     echo "-- Iteration $i --\n";
     try {
         $file_name = tempnam($names_arr[$i], "tempnam_variation3.tmp");
-    } catch (TypeError $e) {
+    } catch (Error $e) {
         echo $e->getMessage(), "\n";
         continue;
     }
@@ -96,9 +96,9 @@ File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
 -- Iteration 6 --
-tempnam(): Argument #1 ($dir) must be a valid path, string given
+tempnam(): Argument #1 ($dir) must not contain any null bytes
 -- Iteration 7 --
-tempnam(): Argument #1 ($dir) must be a valid path, array given
+tempnam(): Argument #1 ($dir) must be of type string, array given
 -- Iteration 8 --
 
 Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d