ext/standard/tests/file: Fix most tests and remove ZPP tests

Author: Girgias

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

@@ -33,19 +33,15 @@ $dir = __DIR__ . '/005_variation2';
 mkdir($dir);
 chdir($dir);
 
-$b = touch(false);
 $c = touch('');
 $d = touch(' ');
 $e = touch('|');
 
-var_dump($a);
-var_dump($b);
 var_dump($c);
 var_dump($d);
 var_dump($e);
 
 echo "\n*** testing file info ***";
-stat_fn(false);
 stat_fn('');
 stat_fn(' ');
 stat_fn('|');
@@ -60,10 +56,6 @@ echo "Done";
 *** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***
 
 *** testing touch ***
-
-Warning: Undefined variable $a in %s on line %d
-NULL
-bool(false)
 bool(false)
 bool(true)
 bool(true)
@@ -74,11 +66,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/file_exists_variation1.phpt

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

ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt

@@ -15,12 +15,12 @@ $buffer_types = array("text", "numeric", "text_with_new_line", "alphanumeric");
 foreach( $buffer_types as $type) {
   fill_buffer($buffer, $type, 100);
   file_put_contents( $file_path."/file_put_contents_variation1.tmp", $buffer);
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 0) );
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 1) );
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 0, NULL, 5) );
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 1, NULL, 5) );
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 0, NULL, 5, 20) );
-  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", 1, NULL, 5, 20) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", false) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", true) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", false, NULL, 5) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", true, NULL, 5) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", false, NULL, 5, 20) );
+  var_dump( file_get_contents($file_path."/file_put_contents_variation1.tmp", true, NULL, 5, 20) );
 
 }
 

ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt

@@ -20,12 +20,12 @@ file_put_contents( $filename, $buffer );
 fill_buffer( $buffer, "numeric", 100);
 file_put_contents( $filename, $buffer, FILE_APPEND, NULL );
 file_put_contents( $filename, $data_array, FILE_APPEND, NULL );
-var_dump( file_get_contents($filename, 0) );
-var_dump( file_get_contents($filename, 1) );
-var_dump( file_get_contents($filename, 0, NULL, 5) );
-var_dump( file_get_contents($filename, 1, NULL, 5) );
-var_dump( file_get_contents($filename, 0, NULL, 5, 20) );
-var_dump( file_get_contents($filename, 1, NULL, 5, 20) );
+var_dump( file_get_contents($filename, false) );
+var_dump( file_get_contents($filename, true) );
+var_dump( file_get_contents($filename, false, NULL, 5) );
+var_dump( file_get_contents($filename, true, NULL, 5) );
+var_dump( file_get_contents($filename, false, NULL, 5, 20) );
+var_dump( file_get_contents($filename, true, NULL, 5, 20) );
 
 echo "--- Done ---";
 ?>

ext/standard/tests/file/file_get_contents_variation8.phpt

@@ -14,60 +14,40 @@ obscure_filename
 <?php
 echo "*** Testing file_get_contents() : variation ***\n";
 /* An array of filenames */
-$names_arr = array(
+$names = [
   /* Invalid args */
-  -1,
-  TRUE,
-  FALSE,
+  '-1',
   "",
   " ",
   "\0",
-  array(),
-
   /* prefix with path separator of a non existing directory*/
   "/no/such/file/dir",
-  "php/php"
-
-);
+  "php/php",
+];
 
-for( $i=0; $i<count($names_arr); $i++ ) {
-    echo "-- Iteration $i --\n";
+foreach ($names as $name) {
     try {
-        var_dump(file_get_contents($names_arr[$i]));
-    } catch (\TypeError|\ValueError $e) {
-        echo get_class($e) . ': ' . $e->getMessage(), "\n";
+        var_dump(file_get_contents($name));
+    } catch (\Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
 echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing file_get_contents() : variation ***
--- Iteration 0 --
 
 Warning: file_get_contents(-1): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
--- Iteration 1 --
-
-Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d
-bool(false)
--- Iteration 2 --
-ValueError: Path must not be empty
--- Iteration 3 --
 ValueError: Path must not be empty
--- Iteration 4 --
 
 Warning: file_get_contents( ): Failed to open stream: No such file or directory in %s on line %d
 bool(false)
--- Iteration 5 --
 ValueError: file_get_contents(): Argument #1 ($filename) must not contain any null bytes
--- Iteration 6 --
-TypeError: file_get_contents(): Argument #1 ($filename) must be of type string, array given
--- 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 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_put_contents_variation8.phpt

@@ -18,34 +18,28 @@ mkdir($dir);
 chdir($dir);
 
 /* An array of filenames */
-$names_arr = array(
-  -1,
-  TRUE,
-  FALSE,
+$names = [
+  /* Invalid args */
+  '-1',
   "",
   " ",
-  //this one also generates a java message rather than our own so we don't replicate php message
   "\0",
-  array(),
-
-  //the next 2 generate java messages so we don't replicate the php messages
+  /* prefix with path separator of a non existing directory*/
   "/no/such/file/dir",
-  "php/php"
-
-);
+  "php/php",
+];
 
-for( $i=0; $i<count($names_arr); $i++ ) {
-    echo "-- Iteration $i --\n";
+foreach ($names as $name) {
     try {
-        $res = file_put_contents($names_arr[$i], "Some data");
+        $res = file_put_contents($name, "Some data");
         if ($res !== false && $res != null) {
-            echo "$res bytes written to: '$names_arr[$i]'\n";
-            unlink($names_arr[$i]);
+            echo "$res bytes written to: '$name'\n";
+            unlink($name);
         } else {
-            echo "Failed to write data to: '$names_arr[$i]'\n";
+            echo "Failed to write data to: '$name'\n";
         }
-    } catch (\TypeError|\ValueError $e) {
-        echo get_class($e) . ': ' . $e->getMessage(), "\n";
+    } catch (\Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
@@ -59,25 +53,13 @@ rmdir($dir);
 ?>
 --EXPECTF--
 *** Testing file_put_contents() : usage variation ***
--- Iteration 0 --
 9 bytes written to: '-1'
--- Iteration 1 --
-9 bytes written to: '1'
--- Iteration 2 --
-ValueError: Path must not be empty
--- Iteration 3 --
 ValueError: Path must not be empty
--- Iteration 4 --
 9 bytes written to: ' '
--- Iteration 5 --
 ValueError: file_put_contents(): Argument #1 ($filename) must not contain any null bytes
--- Iteration 6 --
-TypeError: file_put_contents(): Argument #1 ($filename) must be of type string, array given
--- Iteration 7 --
 
 Warning: file_put_contents(%sdir): Failed to open stream: %s in %s on line %d
 Failed to write data to: '%sir'
--- Iteration 8 --
 
 Warning: file_put_contents(%sphp): Failed to open stream: %s in %s on line %d
 Failed to write data to: '%sphp'

ext/standard/tests/file/filegroup_variation2.phpt

@@ -11,18 +11,16 @@ obscure_filename
 $file_path = __DIR__;
 
 echo "*** Testing Invalid file types ***\n";
-$filenames = array(
+$filenames = [
   /* Invalid filenames */
   -2.34555,
   " ",
   "",
-  TRUE,
-  FALSE,
-
   /* scalars */
   1234,
-  0
-);
+  0,
+  1,
+];
 
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
@@ -40,12 +38,11 @@ Warning: filegroup(): stat failed for   in %s on line %d
 bool(false)
 bool(false)
 
-Warning: filegroup(): stat failed for 1 in %s on line %d
-bool(false)
-bool(false)
-
 Warning: filegroup(): stat failed for 1234 in %s on line %d
 bool(false)
 
 Warning: filegroup(): stat failed for 0 in %s on line %d
 bool(false)
+
+Warning: filegroup(): stat failed for 1 in %s on line %d
+bool(false)

ext/standard/tests/file/fileinode_variation2.phpt

@@ -11,18 +11,16 @@ obscure_filename
 $file_path = __DIR__;
 
 echo "*** Testing Invalid file types ***\n";
-$filenames = array(
+$filenames = [
   /* Invalid filenames */
   -2.34555,
   " ",
   "",
-  TRUE,
-  FALSE,
-
   /* scalars */
   1234,
-  0
-);
+  0,
+  1,
+];
 
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
@@ -40,12 +38,11 @@ Warning: fileinode(): stat failed for   in %s on line %d
 bool(false)
 bool(false)
 
-Warning: fileinode(): stat failed for 1 in %s on line %d
-bool(false)
-bool(false)
-
 Warning: fileinode(): stat failed for 1234 in %s on line %d
 bool(false)
 
 Warning: fileinode(): stat failed for 0 in %s on line %d
 bool(false)
+
+Warning: fileinode(): stat failed for 1 in %s on line %d
+bool(false)

ext/standard/tests/file/fileowner_variation2.phpt

@@ -12,18 +12,16 @@ obscure_filename
 $file_path = __DIR__;
 
 echo "*** Testing Invalid file types ***\n";
-$filenames = array(
+$filenames = [
   /* Invalid filenames */
   -2.34555,
   " ",
   "",
-  TRUE,
-  FALSE,
-
   /* scalars */
   1234,
-  0
-);
+  0,
+  1,
+];
 
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
@@ -41,12 +39,11 @@ Warning: fileowner(): stat failed for   in %s on line %d
 bool(false)
 bool(false)
 
-Warning: fileowner(): stat failed for 1 in %s on line %d
-bool(false)
-bool(false)
-
 Warning: fileowner(): stat failed for 1234 in %s on line %d
 bool(false)
 
 Warning: fileowner(): stat failed for 0 in %s on line %d
 bool(false)
+
+Warning: fileowner(): stat failed for 1 in %s on line %d
+bool(false)

ext/standard/tests/file/fileperms_variation2.phpt

@@ -11,18 +11,16 @@ obscure_filename
 $file_path = __DIR__;
 
 echo "*** Testing Invalid file types ***\n";
-$filenames = array(
+$filenames = [
   /* Invalid filenames */
   -2.34555,
   " ",
   "",
-  TRUE,
-  FALSE,
-
   /* scalars */
   1234,
-  0
-);
+  0,
+  1,
+];
 
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
@@ -40,12 +38,11 @@ Warning: fileperms(): stat failed for   in %s on line %d
 bool(false)
 bool(false)
 
-Warning: fileperms(): stat failed for 1 in %s on line %d
-bool(false)
-bool(false)
-
 Warning: fileperms(): stat failed for 1234 in %s on line %d
 bool(false)
 
 Warning: fileperms(): stat failed for 0 in %s on line %d
 bool(false)
+
+Warning: fileperms(): stat failed for 1 in %s on line %d
+bool(false)