Revert to the previous version for these tests as they were overwritten by mistake...

diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt
index 2bf7e9c09fcd28837c9c8d1776f12c950962a774..e0eddbb5aca0ba16942a4b3480903f8fcb67c7e4 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation4.phpt
+++ b/ext/standard/tests/array/array_rand_variation4.phpt
@@ -38,7 +38,7 @@ $asso_arrays = array(
 
        // array with special chars as keys
 /*6*/  array('##' => "key1", '&$r' => 'key2', '!' => "key3", '<>' =>'key4',
-             "NULL" => 'key5', 
+             "NULL" => 'key5', "\n" => 'newline as key',
              "\t" => "tab as key", "'" => 'single quote as key',
              '"' => 'double quote as key', "\0" => "null char as key")
 );

diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt
index f3c93265ed2dfd4e28a073cf23043b96c25e64fc..01fcc0bc077584f506ce6f5614a1b322cacbd1d0 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation1.phpt
+++ b/ext/standard/tests/array/array_slice_variation1.phpt
@@ -1,227 +1,61 @@
 --TEST--
-Test array_slice() function : usage variations - Pass different data types as $input arg
+Test array_slice() - Third parameter (NULL vs 0)
 --FILE--
 <?php
-/* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
- * Source code: ext/standard/array.c
- */
 
-/*
- * Pass different arguments as $input argument to array_slice() to test behaviour
- */
+var_dump(array_slice(range(1, 3), 0, NULL, 1));
+var_dump(array_slice(range(1, 3), 0, 0, 1));
+var_dump(array_slice(range(1, 3), 0, NULL));
+var_dump(array_slice(range(1, 3), 0, 0));
 
-echo "*** Testing array_slice() : usage variations ***\n";
+var_dump(array_slice(range(1, 3), -1, 0));
+var_dump(array_slice(range(1, 3), -1, 0, 1));
+var_dump(array_slice(range(1, 3), -1, NULL));
+var_dump(array_slice(range(1, 3), -1, NULL, 1));
 
-// Initialise function arguments not being substituted
-$offset = 2;
 
-//get an unset variable
-$unset_var = 10;
-unset ($unset_var);
+$a = 'foo';
+var_dump(array_slice(range(1, 3), 0, $a));
+var_dump(array_slice(range(1, 3), 0, $a));
+var_dump($a);
 
-// get a class
-class classA
-{
-  public function __toString() {
-    return "Class A object";
-  }
-}
-
-// heredoc string
-$heredoc = <<<EOT
-hello world
-EOT;
-
-// get a resource variable
-$fp = fopen(__FILE__, "r");
-
-// unexpected values to be passed to $input argument
-$inputs = array(
-
-       // int data
-/*1*/  0,
-       1,
-       12345,
-       -2345,
-
-       // float data
-/*5*/  10.5,
-       -10.5,
-       12.3456789000e10,
-       12.3456789000E-10,
-       .5,
-
-       // null data
-/*10*/ NULL,
-       null,
-
-       // boolean data
-/*12*/ true,
-       false,
-       TRUE,
-       FALSE,
-       
-       // empty data
-/*16*/ "",
-       '',
-       array(),
-
-       // string data
-/*19*/ "string",
-       'string',
-       $heredoc,
-       
-       // object data
-/*22*/ new classA(),
-
-       // undefined data
-/*23*/ @$undefined_var,
-
-       // unset data
-/*24*/ @$unset_var,
-
-       // resource variable
-/*25*/ $fp
-);
-
-// loop through each element of $inputs to check the behavior of array_slice()
-$iterator = 1;
-foreach($inputs as $input) {
-  echo "\n-- Iteration $iterator --\n";
-  var_dump( array_slice($input, $offset) );
-  $iterator++;
-};
-
-fclose($fp);
-
-echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
-NULL
-
--- Iteration 18 --
+--EXPECT--
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
 array(0) {
 }
-
--- Iteration 19 --
-
-Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_slice() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_slice() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
\ No newline at end of file
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(1) {
+  [0]=>
+  int(3)
+}
+array(1) {
+  [2]=>
+  int(3)
+}
+array(0) {
+}
+array(0) {
+}
+unicode(3) "foo"

diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt
index 0ceba736ae1a4264bac969af65b712af7124e9db..dab0ee51594e291e6765bf6d3d2a39cdae8268fe 100644 (file)
--- a/ext/standard/tests/array/arsort_variation3.phpt
+++ b/ext/standard/tests/array/arsort_variation3.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort integer/float values
 
 /*
  * Testing arsort() by providing different integer/float value arrays for $array argument with following values
- * 1. flag value as defualt
+ * 1. flag value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
 */
@@ -59,7 +59,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing arsort() : usage variations ***
 
 -- Testing arsort() by supplying various integer/float arrays --
@@ -273,7 +273,7 @@ array(11) {
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -283,15 +283,15 @@ array(7) {
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
 - Sort_flag = SORT_REGULAR -
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -301,15 +301,15 @@ array(7) {
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
 - Sort_flag = SORT_NUMERIC -
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -319,8 +319,8 @@ array(7) {
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt
index 5e64a4e89535901828b20c561c2fb152cb69a243..1eac39eeff957b7637b2f016a191289ead016070 100644 (file)
--- a/ext/standard/tests/array/rsort_variation4.phpt
+++ b/ext/standard/tests/array/rsort_variation4.phpt
@@ -23,7 +23,7 @@ $value3 = 555;
 // an array containing integer references 
 $unsorted_numerics =  array( &$value1 , &$value2, &$value3);
 
-echo "\n-- 'flag' value is defualt --\n";
+echo "\n-- 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( rsort($temp_array) );
 var_dump( $temp_array);
@@ -44,7 +44,7 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing rsort() : variation ***
 
--- 'flag' value is defualt --
+-- 'flag' value is default --
 bool(true)
 array(3) {
   [0]=>
@@ -76,4 +76,4 @@ array(3) {
   [2]=>
   &int(33)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/file/006_error.phpt b/ext/standard/tests/file/006_error.phpt
index bef7a89f44a47b63367f556ea314f3cfd8604e1a..bce98ecd3d0860c89b6dbe7438c614f894bca1af 100644 (file)
--- a/ext/standard/tests/file/006_error.phpt
+++ b/ext/standard/tests/file/006_error.phpt
@@ -11,7 +11,7 @@ $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
         unlink ($filename);
-        die('skip...cannot be run as root\n');
+        die('skip cannot be run as root');
 }
 
 unlink($filename);
@@ -68,13 +68,13 @@ unlink( dirname(__FILE__)."/006_error.tmp");
 --EXPECTF--
 *** Testing error conditions for fileperms(), chmod() ***
 
-Warning: chmod(): Operation not permitted in %s on line %d
+Warning: chmod(): %s in %s on line %d
 bool(false)
-%d
+100644
 
-Warning: chmod(): Operation not permitted in %s on line %d
+Warning: chmod(): %s in %s on line %d
 bool(false)
-%d
+40755
 
 Warning: chmod(): No such file or directory in %s on line %d
 bool(false)
@@ -105,4 +105,3 @@ Warning: fileperms() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
 *** Done ***
-

diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index d8d2b8a517dc98c252d6060924f90bb83dc15d8b..33f31f527d45c013835c8345365f13ce2266bf8a 100644 (file)
--- a/ext/standard/tests/file/006_variation2.phpt
+++ b/ext/standard/tests/file/006_variation2.phpt
@@ -11,7 +11,7 @@ $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
         unlink ($filename);
-        die('skip...cannot be run as root\n');
+        die('skip cannot be run as root');
 }
 
 unlink($filename);
@@ -88,100 +88,99 @@ chmod(dirname(__FILE__)."/006_variation2", 0777);
 unlink(dirname(__FILE__)."/006_variation2.tmp");
 rmdir(dirname(__FILE__)."/006_variation2");
 ?>
---EXPECTF--    
+--EXPECTF--
 *** Testing fileperms() & chmod() : usage variations ***
 
 *** Testing fileperms(), chmod() with miscellaneous permissions ***
 -- Iteration 1 --
 bool(true)
-%d
+107777
 bool(true)
-%d
+47777
 -- Iteration 2 --
 bool(true)
-%d
+100000
 bool(true)
-%d
+40000
 -- Iteration 3 --
 bool(true)
-%d
+101000
 bool(true)
-%d
+41000
 -- Iteration 4 --
 bool(true)
-%d
+101111
 bool(true)
-%d
+41111
 -- Iteration 5 --
 bool(true)
-%d
+107001
 bool(true)
-%d
+47001
 -- Iteration 6 --
 bool(true)
-%d
+100001
 bool(true)
-%d
+40001
 -- Iteration 7 --
 bool(true)
-%d
+101411
 bool(true)
-%d
+41411
 -- Iteration 8 --
 bool(true)
-%d
+107141
 bool(true)
-%d
+47141
 -- Iteration 9 --
 bool(true)
-%d
+100637
 bool(true)
-%d
+40637
 -- Iteration 10 --
 bool(true)
-%d
+103567
 bool(true)
-%d
+43567
 -- Iteration 11 --
 bool(true)
-%d
+103567
 bool(true)
-%d
+43567
 -- Iteration 12 --
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+103567
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+43567
 -- Iteration 13 --
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+103567
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+43567
 -- Iteration 14 --
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+103567
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+43567
 -- Iteration 15 --
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+103567
 
 Warning: chmod() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
-%d
+43567
 *** Done ***
-

diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt
index e1a74fc984c039b6fd9add8aa54a31d3b3d868e3..a048af6ccbf611f047155ce3477a95a447ebd4c0 100644 (file)
--- a/ext/standard/tests/file/disk.phpt
+++ b/ext/standard/tests/file/disk.phpt
@@ -25,7 +25,7 @@ var_dump(disk_total_space("/some/path/here"));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
@@ -37,8 +37,8 @@ bool(false)
 
 Warning: disk_total_space(): No such file or directory in %s on line %d
 bool(false)
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 Warning: disk_free_space(): No such file or directory in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt
index cae37bad59d37799b52b3763a488301ac944b5b9..f8684e92a9b68bbae15983f1a63ef647321e49ed 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@ -7,26 +7,27 @@ memory_limit=32M
 /*
  *  Prototype: float disk_free_space( string directory )
  *  Description: Given a string containing a directory, this function 
- *  will return the number of bytes available on the corresponding 
- *  filesystem or disk partition
+ *               will return the number of bytes available on the corresponding 
+ *               filesystem or disk partition
  */
 
 $file_path = dirname(__FILE__);
-include($file_path."/file.inc");
 
 echo "*** Testing with existing directory ***\n";
 var_dump( disk_free_space($file_path) ); 
 var_dump( diskfreespace($file_path) ); 
-$dir = "/disk_free_space";
 
 echo "*** Testing with newly created directory ***\n";
+$dir = "/disk_free_space";
 mkdir($file_path.$dir);
 echo" \n Free Space before writing to a file\n";
 $space1 =  disk_free_space($file_path.$dir); 
-var_dump($space1); 
+var_dump( $space1 ); 
 
-fill_buffer($buffer, "text", 3000000);
-file_put_contents($file_path.$dir."/disk_free_space.tmp", $buffer);
+$fh = fopen($file_path.$dir."/disk_free_space.tmp", "a");
+for( $i=1; $i<=1000; $i++)
+fwrite($fh, (binary)"x");
+fclose($fh);
 
 echo "\n Free Space after writing to a file\n";
 $space2 =  disk_free_space($file_path.$dir); 
@@ -37,29 +38,33 @@ if( $space1 > $space2 )
 else
   echo "\n Free Space Value Is Incorrect\n";
 
-echo"\n-- Done --";
+echo "*** Testing with Binary Input ***\n";
+var_dump( disk_free_space(b"$file_path") ); 
+
+echo"\n--- Done ---";
 ?>
 
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-$dir = "/disk_free_space";
-unlink($file_path.$dir."/disk_free_space.tmp");
-rmdir($file_path.$dir);
+unlink($file_path."/disk_free_space/disk_free_space.tmp");
+rmdir($file_path."/disk_free_space");
 ?>
 
 --EXPECTF--
 *** Testing with existing directory ***
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 *** Testing with newly created directory ***
  
  Free Space before writing to a file
-float(%f)
+float(%d)
 
  Free Space after writing to a file
-float(%f)
+float(%d)
 
  Free Space Value Is Correct
+*** Testing with Binary Input ***
+float(%d)
 
--- Done --
+--- Done ---

diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt
index 945b7b9c847b22af452727fcb6f2786c34c9c378..aad4e4e452db9934fd002051904cf4a872d945b7 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_error.phpt
+++ b/ext/standard/tests/file/disk_free_space_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test disk_free_space and its alias diskfreespace() functions : error conditions
+Test disk_free_space and its alias diskfreespace() functions : error conditions.
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == 'WIN' )
-  die("skip Not Valid for Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip Not valid on Windows");
 ?>
 --FILE--
 <?php
 /*
  *  Prototype: float disk_free_space( string directory )
- *  Description: Given a string containing a directory, this function will
+ *  Description: Given a string containing a directory, this function will 
  *               return the number of bytes available on the corresponding 
  *               filesystem or disk partition
  */
@@ -27,7 +27,7 @@ var_dump( disk_free_space( $file_path."/dir1" )); // Invalid directory
 var_dump( diskfreespace( $file_path."/dir1" ));
 
 $fh = fopen( $file_path."/disk_free_space.tmp", "w" );
-fwrite( $fh, " Garbage data for the temporary file" );
+fwrite( $fh, (binary)" Garbage data for the temporary file" );
 var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory
 var_dump( diskfreespace( $file_path."/disk_free_space.tmp" ));
 fclose($fh);
@@ -55,12 +55,12 @@ NULL
 Warning: diskfreespace() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: disk_free_space(): %s in %s on line %d
+Warning: disk_free_space(): No such file or directory in %s on line %d
 bool(false)
 
-Warning: diskfreespace(): %s in %s on line %d
+Warning: diskfreespace(): No such file or directory in %s on line %d
 bool(false)
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Done --

diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index 01fa183735b7e1baa0c2392056833dd68ffdac21..c1809986fd8604c08df7bf06189041758d45b03e 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test disk_free_space and its alias diskfreespace() functions : usage variations
+Test disk_free_space and its alias diskfreespace() functions : Usage Variations
 --FILE--
 <?php
 /*
@@ -11,16 +11,15 @@ Test disk_free_space and its alias diskfreespace() functions : usage variations
 
 $file_path = dirname(__FILE__);
 
-echo "*** Testing disk_free_space() function with a directory ***\n";
+echo "*** Testing with a directory ***\n";
 var_dump( disk_free_space($file_path."/..") ); 
 var_dump( diskfreespace($file_path."/..") ); 
 
-echo "\n*** Testing for the return type ***\n";
+echo "\nTesting for the return type ***\n";
 $return_value = disk_free_space($file_path); 
 var_dump( is_float($return_value) );
 
-echo "\n*** Testing disk_free_space() function with different styles of file and directory ***";
-
+echo "\n*** Testing with different directory combinations ***";
 $dir = "/disk_free_space";
 mkdir($file_path.$dir);
 
@@ -42,15 +41,15 @@ $dirs_arr = array(
   $file_path.$dir.chr(0),
   $file_path."/.".$dir.chr(0),
   ".".chr(0).$file_path.$dir,
-  ".".chr(0).$file_path.$dir.chr(0) 
+  ".".chr(0).$file_path.$dir.chr(0)
 );
 
 $count = 1;
 /* loop through to test each element the above array */
-foreach($dirs_arr as $dir) {
+foreach($dirs_arr as $dir1) {
   echo "\n-- Iteration $count --\n";
-  var_dump( disk_free_space( $dir ) );
-  var_dump( diskfreespace( $dir ) );
+  var_dump( disk_free_space( $dir1 ) );
+  var_dump( diskfreespace( $dir1 ) );
   $count++;
 }
 
@@ -59,65 +58,66 @@ echo"\n--- Done ---";
 
 --CLEAN--
 <?php
-$file_path = dirname(__FILE__)."/disk_free_space";
-rmdir($file_path);
+$file_path = dirname(__FILE__);
+rmdir($file_path."/disk_free_space");
 ?>
 
+
 --EXPECTF--
-*** Testing disk_free_space() function with a directory ***
-float(%f)
-float(%f)
+*** Testing with a directory ***
+float(%d)
+float(%d)
 
-*** Testing for the return type ***
+Testing for the return type ***
 bool(true)
 
-*** Testing disk_free_space() function with different styles of file and directory ***
+*** Testing with different directory combinations ***
 -- Iteration 1 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 2 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 3 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 4 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 5 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 6 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 7 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 8 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 9 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 10 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 11 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 -- Iteration 12 --
-float(%f)
-float(%f)
+float(%d)
+float(%d)
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt
index dd459c2819024c3b58fdcc2968d1bad7d8062747..d211f39437bf76f32565041bf5a5718f1c16dbcb 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_basic.phpt
+++ b/ext/standard/tests/file/disk_total_space_basic.phpt
@@ -1,36 +1,34 @@
 --TEST--
 Test disk_total_space() function : basic functionality
---XFAIL--
-Pending completion of Unicode streams
 --FILE--
 <?php
 /*
  *  Prototype: float disk_total_space( string $directory );
- *  Description: given a string containing a directory, this 
- *               function will return the total number of bytes 
- *               on the corresponding filesyatem or disk partition.
+ *  Description: given a string containing a directory, this function will 
+ *               return the total number of bytes on the corresponding filesyatem
+ *               or disk partition.
  */
 
 $file_path = dirname(__FILE__);
 
-echo "*** Testing with existing directory ***\n";
+echo "*** Testing with normal directory ***\n";
 var_dump( disk_total_space($file_path) );
 
 echo "*** Testing with newly created directory ***\n";
-mkdir($file_path."/disk_total_space");
-var_dump( disk_total_space($file_path."/disk_total_space") );
+$dir = "/disk_total_space";
 
-$fh = fopen($file_path."/disk_total_space/disk_total_space.tmp", "w");
-fwrite($fh, "Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data");
+mkdir($file_path.$dir);
+var_dump( disk_total_space($file_path.$dir) );
+$fh = fopen($file_path.$dir."/disk_total_space.tmp", "w");
+fwrite($fh, (binary)"Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data");
 
 fclose($fh);
 
-echo" \n Total Space after writing to a file\n";
-var_dump( disk_total_space($file_path."/disk_total_space") );
+echo"\nTotal Space after writing to a file\n";
+var_dump( disk_total_space($file_path.$dir) );
 
-echo"\n--- Done ---";
+echo"\n-- Done --";
 ?>
-
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
@@ -39,12 +37,12 @@ rmdir($file_path."/disk_total_space");
 ?>
 
 --EXPECTF--
-*** Testing with existing directory ***
-float(%f)
+*** Testing with normal directory ***
+float(%d)
 *** Testing with newly created directory ***
-float(%f)
- 
- Total Space after writing to a file
-float(%f)
+float(%d)
+
+Total Space after writing to a file
+float(%d)
 
---- Done ---
+-- Done --

diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt
index d49589af4126689bd3bfccd18fc6a6a3c5d2aa41..3888b7e09d6f9d38aebacd5d3f15cebc1076331c 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_error.phpt
+++ b/ext/standard/tests/file/disk_total_space_error.phpt
@@ -1,17 +1,15 @@
 --TEST--
 Test disk_total_space() function : error conditions
---XFAIL--
-Pending completion of Unicode streams
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == 'WIN' )
-  die("skip Not Valid for Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN')
+  die("skip Not valid on Windows");
 ?>
 --FILE--
 <?php
 /*
  *  Prototype: float disk_total_space( string $directory );
- *  Description: given a string containing a directory, this function
+ *  Description: given a string containing a directory, this function 
  *               will return the total number of bytes on the corresponding 
  *               filesystem or disk partition
  */
@@ -26,7 +24,7 @@ var_dump( disk_total_space( $file_path, "extra argument") ); // More than valid
 var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory
 
 $fh = fopen( $file_path."/disk_total_space.tmp", "w" );
-fwrite( $fh, " Garbage data for the temporary file" );
+fwrite( $fh, (binary)" Garbage data for the temporary file" );
 var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory
 fclose($fh);
 
@@ -48,6 +46,6 @@ NULL
 
 Warning: disk_total_space(): No such file or directory in %s on line %d
 bool(false)
-float(%f)
+float(%d)
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index 6cd96cd8725d882e0c6c85df2864c7188f5f2f49..c03ba594bdfaa29e819a1fe2bb08570b9c8e0af1 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test disk_total_space() functions : usage variations
+Testing disk_total_space() functions : Usage Variations.
 --FILE--
 <?php
 /*
@@ -18,9 +18,9 @@ echo "\nTesting for the return type ***\n";
 $return_value = disk_total_space($file_path); 
 var_dump( is_float($return_value) );
 
-echo "\n*** Testing disk_total_space() function with different directory combinations ***";
-
+echo "\n*** Testing with different directory combinations ***";
 $dir = "/disk_total_space";
+
 mkdir($file_path.$dir);
 
 $dirs_arr = array(
@@ -29,7 +29,7 @@ $dirs_arr = array(
   $file_path."/.".$dir,
 
   /* Testing a file trailing slash */
-  $file_path.$dir."/",
+  $file_path."".$dir."/",
   $file_path."/.".$dir."/",
 
   /* Testing file with double trailing slashes */
@@ -44,6 +44,7 @@ $dirs_arr = array(
   ".".chr(0).$file_path.$dir.chr(0)
 );
 
+
 $count = 1;
 /* loop through to test each element the above array */
 foreach($dirs_arr as $dir1) {
@@ -52,57 +53,63 @@ foreach($dirs_arr as $dir1) {
   $count++;
 }
 
+echo "*** Testing with Binary Input ***\n";
+var_dump( disk_total_space(b"$file_path") ); 
+
 echo"\n--- Done ---";
 ?>
 
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-$dir = "/disk_total_space";
-rmdir($file_path.$dir);
+rmdir($file_path."/disk_total_space");
 ?>
+
+
 --EXPECTF--
 *** Testing with a directory ***
-float(%f)
+float(%d)
 
 Testing for the return type ***
 bool(true)
 
-*** Testing disk_total_space() function with different directory combinations ***
+*** Testing with different directory combinations ***
 -- Iteration 1 --
-float(%f)
+float(%d)
 
 -- Iteration 2 --
-float(%f)
+float(%d)
 
 -- Iteration 3 --
-float(%f)
+float(%d)
 
 -- Iteration 4 --
-float(%f)
+float(%d)
 
 -- Iteration 5 --
-float(%f)
+float(%d)
 
 -- Iteration 6 --
-float(%f)
+float(%d)
 
 -- Iteration 7 --
-float(%f)
+float(%d)
 
 -- Iteration 8 --
-float(%f)
+float(%d)
 
 -- Iteration 9 --
-float(%f)
+float(%d)
 
 -- Iteration 10 --
-float(%f)
+float(%d)
 
 -- Iteration 11 --
-float(%f)
+float(%d)
 
 -- Iteration 12 --
-float(%f)
+float(%d)
+*** Testing with Binary Input ***
+float(%d)
 
 --- Done ---

diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index b1c59015de72c1a8fab0a3239215ac0a90616b40..0e82e47fc15fd63fc21cbb30ddac0c697d6fe772 100644 (file)
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -24,10 +24,9 @@ if($file_handle == false)
    
 var_dump( fflush($file_handle, $file_handle) );
 fclose($file_handle);
-fflush($file_handle);
 
 // test invalid arguments : non-resources
-echo "\n-- Testing fflush(): with invalid arguments --\n";
+echo "-- Testing fflush(): with invalid arguments --\n";
 $invalid_args = array (
   "string",
   10,
@@ -42,7 +41,7 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) {
   echo "-- Iteration $loop_counter --\n";
   var_dump( fflush($invalid_args[$loop_counter - 1]) );
 }
-echo "Done\n";
+echo "\n*** Done ***";
 ?>
 
 --CLEAN--
@@ -61,9 +60,6 @@ NULL
 
 Warning: fflush() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
-
-Warning: fflush(): 5 is not a valid stream resource in %s on line %d
-
 -- Testing fflush(): with invalid arguments --
 -- Iteration 1 --
 
@@ -89,5 +85,5 @@ NULL
 
 Warning: fflush() expects parameter 1 to be resource, object given in %s on line %d
 NULL
-Done
 
+*** Done ***

diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt
index 339f10cb9f32b1d90e6efce1c8b696ba8ecd9b82..c76f1d769a5ac98ea298c7f7e7c593ebcab6a235 100644 (file)
--- a/ext/standard/tests/file/flock_variation.phpt
+++ b/ext/standard/tests/file/flock_variation.phpt
@@ -1,45 +1,371 @@
 --TEST--
-Test flock() function: usage variations
+Test flock() function: Variations
 --FILE--
 <?php
 /* 
 Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]);
-Description: PHP supports a portable way of locking complete files in an advisory way
+Description: PHP supports a portable way of locking complete files 
+  in an advisory way
 */
 
-echo "*** Test flock() function: with the operations given as numeric values ***\n";
+echo "*** Testing flock() fun with the various operation and 
+            wouldblock values                                ***\n";
+$file = dirname(__FILE__)."/flock.tmp";
+$fp = fopen($file, "w");
 
-$filename = dirname(__FILE__)."/flock_variation.tmp";
-$file_handle = fopen($filename, "w");
-
-/* array of operations */
+/* array of operatons */
 $operations = array(
-  1,  //nothing but LOCK_SH
-  2,  //nothing but LOCK_EX
-  2.234,  //nothing but LOCK_EX
-  TRUE  //nothing but LOCK_SH
+  LOCK_SH,
+  LOCK_EX,
+  LOCK_SH|LOCK_NB,
+  LOCK_EX|LOCK_NB,
+  LOCK_SH|LOCK_EX,
+  LOCK_UN,
+  1, 
+  2,
+  2.234,
+  TRUE
+);
+
+/* array of wouldblocks */
+$wouldblocks = array(
+  0,
+  1,
+  2,
+  1.234,
+  TRUE,
+  FALSE,
+  NULL,
+  array(1,2,3),
+  array(),
+  "string",
+  "",
+  /* binary input */
+  b"string",
+  b"",
+  "\0"
 );
 
 $i = 0;
 foreach($operations as $operation) {
-  var_dump(flock($file_handle, $operation));
-  var_dump(flock($file_handle, 3));  //nothing but LOCK_UN
+  echo "--- Outer iteration $i ---\n";
+  var_dump(flock($fp, $operation));
+  $j = 0;
+  foreach($wouldblocks as $wouldblock) {
+    echo "-- Inner iteration $j in $i --\n";
+    var_dump(flock($fp, $operation, $wouldblock));
+    $j++;
+  }
   $i++;
 }
 
-fclose($file_handle);
-unlink($filename);
+fclose($fp);
+@unlink($file);
 
-echo "*** Done ***\n";
+echo "\n*** Done ***\n";
 ?>
---EXPECTF--    
-*** Test flock() function: with the operations given as numeric values ***
+--EXPECT--
+*** Testing flock() fun with the various operation and 
+            wouldblock values                                ***
+--- Outer iteration 0 ---
+bool(true)
+-- Inner iteration 0 in 0 --
+bool(true)
+-- Inner iteration 1 in 0 --
+bool(true)
+-- Inner iteration 2 in 0 --
+bool(true)
+-- Inner iteration 3 in 0 --
+bool(true)
+-- Inner iteration 4 in 0 --
+bool(true)
+-- Inner iteration 5 in 0 --
+bool(true)
+-- Inner iteration 6 in 0 --
+bool(true)
+-- Inner iteration 7 in 0 --
+bool(true)
+-- Inner iteration 8 in 0 --
+bool(true)
+-- Inner iteration 9 in 0 --
+bool(true)
+-- Inner iteration 10 in 0 --
+bool(true)
+-- Inner iteration 11 in 0 --
+bool(true)
+-- Inner iteration 12 in 0 --
+bool(true)
+-- Inner iteration 13 in 0 --
+bool(true)
+--- Outer iteration 1 ---
+bool(true)
+-- Inner iteration 0 in 1 --
+bool(true)
+-- Inner iteration 1 in 1 --
+bool(true)
+-- Inner iteration 2 in 1 --
+bool(true)
+-- Inner iteration 3 in 1 --
+bool(true)
+-- Inner iteration 4 in 1 --
+bool(true)
+-- Inner iteration 5 in 1 --
+bool(true)
+-- Inner iteration 6 in 1 --
+bool(true)
+-- Inner iteration 7 in 1 --
+bool(true)
+-- Inner iteration 8 in 1 --
+bool(true)
+-- Inner iteration 9 in 1 --
+bool(true)
+-- Inner iteration 10 in 1 --
+bool(true)
+-- Inner iteration 11 in 1 --
+bool(true)
+-- Inner iteration 12 in 1 --
+bool(true)
+-- Inner iteration 13 in 1 --
+bool(true)
+--- Outer iteration 2 ---
+bool(true)
+-- Inner iteration 0 in 2 --
+bool(true)
+-- Inner iteration 1 in 2 --
+bool(true)
+-- Inner iteration 2 in 2 --
+bool(true)
+-- Inner iteration 3 in 2 --
+bool(true)
+-- Inner iteration 4 in 2 --
+bool(true)
+-- Inner iteration 5 in 2 --
+bool(true)
+-- Inner iteration 6 in 2 --
+bool(true)
+-- Inner iteration 7 in 2 --
+bool(true)
+-- Inner iteration 8 in 2 --
+bool(true)
+-- Inner iteration 9 in 2 --
+bool(true)
+-- Inner iteration 10 in 2 --
+bool(true)
+-- Inner iteration 11 in 2 --
+bool(true)
+-- Inner iteration 12 in 2 --
+bool(true)
+-- Inner iteration 13 in 2 --
+bool(true)
+--- Outer iteration 3 ---
+bool(true)
+-- Inner iteration 0 in 3 --
+bool(true)
+-- Inner iteration 1 in 3 --
+bool(true)
+-- Inner iteration 2 in 3 --
+bool(true)
+-- Inner iteration 3 in 3 --
+bool(true)
+-- Inner iteration 4 in 3 --
+bool(true)
+-- Inner iteration 5 in 3 --
+bool(true)
+-- Inner iteration 6 in 3 --
+bool(true)
+-- Inner iteration 7 in 3 --
+bool(true)
+-- Inner iteration 8 in 3 --
+bool(true)
+-- Inner iteration 9 in 3 --
+bool(true)
+-- Inner iteration 10 in 3 --
+bool(true)
+-- Inner iteration 11 in 3 --
+bool(true)
+-- Inner iteration 12 in 3 --
+bool(true)
+-- Inner iteration 13 in 3 --
+bool(true)
+--- Outer iteration 4 ---
+bool(true)
+-- Inner iteration 0 in 4 --
+bool(true)
+-- Inner iteration 1 in 4 --
+bool(true)
+-- Inner iteration 2 in 4 --
+bool(true)
+-- Inner iteration 3 in 4 --
+bool(true)
+-- Inner iteration 4 in 4 --
+bool(true)
+-- Inner iteration 5 in 4 --
+bool(true)
+-- Inner iteration 6 in 4 --
+bool(true)
+-- Inner iteration 7 in 4 --
+bool(true)
+-- Inner iteration 8 in 4 --
+bool(true)
+-- Inner iteration 9 in 4 --
 bool(true)
+-- Inner iteration 10 in 4 --
 bool(true)
+-- Inner iteration 11 in 4 --
 bool(true)
+-- Inner iteration 12 in 4 --
 bool(true)
+-- Inner iteration 13 in 4 --
 bool(true)
+--- Outer iteration 5 ---
 bool(true)
+-- Inner iteration 0 in 5 --
 bool(true)
+-- Inner iteration 1 in 5 --
 bool(true)
+-- Inner iteration 2 in 5 --
+bool(true)
+-- Inner iteration 3 in 5 --
+bool(true)
+-- Inner iteration 4 in 5 --
+bool(true)
+-- Inner iteration 5 in 5 --
+bool(true)
+-- Inner iteration 6 in 5 --
+bool(true)
+-- Inner iteration 7 in 5 --
+bool(true)
+-- Inner iteration 8 in 5 --
+bool(true)
+-- Inner iteration 9 in 5 --
+bool(true)
+-- Inner iteration 10 in 5 --
+bool(true)
+-- Inner iteration 11 in 5 --
+bool(true)
+-- Inner iteration 12 in 5 --
+bool(true)
+-- Inner iteration 13 in 5 --
+bool(true)
+--- Outer iteration 6 ---
+bool(true)
+-- Inner iteration 0 in 6 --
+bool(true)
+-- Inner iteration 1 in 6 --
+bool(true)
+-- Inner iteration 2 in 6 --
+bool(true)
+-- Inner iteration 3 in 6 --
+bool(true)
+-- Inner iteration 4 in 6 --
+bool(true)
+-- Inner iteration 5 in 6 --
+bool(true)
+-- Inner iteration 6 in 6 --
+bool(true)
+-- Inner iteration 7 in 6 --
+bool(true)
+-- Inner iteration 8 in 6 --
+bool(true)
+-- Inner iteration 9 in 6 --
+bool(true)
+-- Inner iteration 10 in 6 --
+bool(true)
+-- Inner iteration 11 in 6 --
+bool(true)
+-- Inner iteration 12 in 6 --
+bool(true)
+-- Inner iteration 13 in 6 --
+bool(true)
+--- Outer iteration 7 ---
+bool(true)
+-- Inner iteration 0 in 7 --
+bool(true)
+-- Inner iteration 1 in 7 --
+bool(true)
+-- Inner iteration 2 in 7 --
+bool(true)
+-- Inner iteration 3 in 7 --
+bool(true)
+-- Inner iteration 4 in 7 --
+bool(true)
+-- Inner iteration 5 in 7 --
+bool(true)
+-- Inner iteration 6 in 7 --
+bool(true)
+-- Inner iteration 7 in 7 --
+bool(true)
+-- Inner iteration 8 in 7 --
+bool(true)
+-- Inner iteration 9 in 7 --
+bool(true)
+-- Inner iteration 10 in 7 --
+bool(true)
+-- Inner iteration 11 in 7 --
+bool(true)
+-- Inner iteration 12 in 7 --
+bool(true)
+-- Inner iteration 13 in 7 --
+bool(true)
+--- Outer iteration 8 ---
+bool(true)
+-- Inner iteration 0 in 8 --
+bool(true)
+-- Inner iteration 1 in 8 --
+bool(true)
+-- Inner iteration 2 in 8 --
+bool(true)
+-- Inner iteration 3 in 8 --
+bool(true)
+-- Inner iteration 4 in 8 --
+bool(true)
+-- Inner iteration 5 in 8 --
+bool(true)
+-- Inner iteration 6 in 8 --
+bool(true)
+-- Inner iteration 7 in 8 --
+bool(true)
+-- Inner iteration 8 in 8 --
+bool(true)
+-- Inner iteration 9 in 8 --
+bool(true)
+-- Inner iteration 10 in 8 --
+bool(true)
+-- Inner iteration 11 in 8 --
+bool(true)
+-- Inner iteration 12 in 8 --
+bool(true)
+-- Inner iteration 13 in 8 --
+bool(true)
+--- Outer iteration 9 ---
+bool(true)
+-- Inner iteration 0 in 9 --
+bool(true)
+-- Inner iteration 1 in 9 --
+bool(true)
+-- Inner iteration 2 in 9 --
+bool(true)
+-- Inner iteration 3 in 9 --
+bool(true)
+-- Inner iteration 4 in 9 --
+bool(true)
+-- Inner iteration 5 in 9 --
+bool(true)
+-- Inner iteration 6 in 9 --
+bool(true)
+-- Inner iteration 7 in 9 --
+bool(true)
+-- Inner iteration 8 in 9 --
+bool(true)
+-- Inner iteration 9 in 9 --
+bool(true)
+-- Inner iteration 10 in 9 --
+bool(true)
+-- Inner iteration 11 in 9 --
+bool(true)
+-- Inner iteration 12 in 9 --
+bool(true)
+-- Inner iteration 13 in 9 --
+bool(true)
+
 *** Done ***

diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt
index ada182dbbef8f7fbcd153a0bdadf571c0cf00afc..e9bfd26008494468ac2430ffbc40bad0002ed869 100644 (file)
--- a/ext/standard/tests/file/fpassthru_error.phpt
+++ b/ext/standard/tests/file/fpassthru_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test fpassthru() function: Error conditions
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
 --FILE--
 <?php
 /* 
@@ -22,11 +20,6 @@ var_dump( fpassthru() );
 /* No.of args greaer than expected */
 var_dump( fpassthru("", "") );
 
-/* fpassthru on a closed file */
-$h = fopen(__FILE__,'r');
-fclose($h);
-fpassthru($h);
-
 echo "\n*** Done ***\n";
 
 ?>
@@ -35,16 +28,13 @@ echo "\n*** Done ***\n";
 
 Warning: fread() expects parameter 1 to be resource, Unicode string given in %s on line %d
 
-Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+Warning: fpassthru() expects parameter 1 to be resource, null given in %s on line %d
+NULL
 
 Warning: fpassthru() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
+NULL
 
 Warning: fpassthru() expects exactly 1 parameter, 2 given in %s on line %d
-bool(false)
-
-Warning: fpassthru(): 5 is not a valid stream resource in %s on line %d
+NULL
 
 *** Done ***
-

diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 152a717327409a5078ea8efa22700dc01b9dacf3..ae45f5e274cd3d14bf31f2f2627c5173c717d80b 100644 (file)
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test fread() function : error conditions
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
 --FILE--
 <?php
 /*
@@ -64,11 +62,11 @@ echo "Done\n";
 -- Testing fread() with zero argument --
 
 Warning: fread() expects exactly 2 parameters, 0 given in %s on line %d
-bool(false)
+NULL
 -- Testing fread() with more than expected number of arguments --
 
 Warning: fread() expects exactly 2 parameters, 3 given in %s on line %d
-bool(false)
+NULL
 -- Testing fread() with invalid length arguments --
 
 Warning: fread(): Length parameter must be greater than 0 in %s on line %d
@@ -80,38 +78,37 @@ bool(false)
 -- Iteration 1 --
 
 Warning: fread() expects parameter 1 to be resource, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: fread() expects parameter 1 to be resource, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: fread() expects parameter 1 to be resource, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: fread() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: fread() expects parameter 1 to be resource, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: fread() expects parameter 1 to be resource, object given in %s on line %d
-bool(false)
+NULL
 -- Testing fwrite() with closed/unset file handle --
 
 Notice: Undefined variable: file_content_type in %s on line %d
 
-Warning: fread(): %d is not a valid stream resource in %s on line %d
+Warning: fread(): 5 is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fread() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: fclose() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
+NULL
 Done
-

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index b6b69952bc0b0ff336b61a9aeb2f1463fcec52d8..e84a9f1a90ffa8a154a7a6f88a6efcfd07dd27bd 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test fseek(), ftell() & rewind() functions : error conditions - fseek() 
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
 --FILE--
 <?php
 
@@ -59,44 +57,43 @@ echo "Done\n";
 -- Testing fseek() with zero argument --
 
 Warning: fseek() expects at least 2 parameters, 0 given in %s on line %d
-bool(false)
+NULL
 -- Testing fseek() with unexpected number of arguments --
 
 Warning: fseek() expects at least 2 parameters, 1 given in %s on line %d
-bool(false)
+NULL
 
 Warning: fseek() expects at most 3 parameters, 4 given in %s on line %d
-bool(false)
+NULL
 -- Testing fseek() with invalid arguments --
 -- Iteration 1 --
 
 Warning: fseek() expects parameter 1 to be resource, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: fseek() expects parameter 1 to be resource, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: fseek() expects parameter 1 to be resource, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: fseek() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: fseek() expects parameter 1 to be resource, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: fseek() expects parameter 1 to be resource, object given in %s on line %d
-bool(false)
+NULL
 -- Testing fseek() with closed/unset file handle --
 Warning: fseek(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fseek() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
+NULL
 Done
-

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index 86b4d178de0ed06f1649e0d5e95a530ebd6044f7..a41f3b17a29cd49d3f0c778fd6da654c30942dc6 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test fseek(), ftell() & rewind() functions : error conditions - ftell()
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
 --FILE--
 <?php
 
@@ -58,41 +56,40 @@ echo "Done\n";
 -- Testing ftell() with zero argument --
 
 Warning: ftell() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
+NULL
 -- Testing ftell() with more than expected number of arguments --
 
 Warning: ftell() expects exactly 1 parameter, 2 given in %s on line %d
-bool(false)
+NULL
 -- Testing ftell() with invalid arguments --
 -- Iteration 1 --
 
 Warning: ftell() expects parameter 1 to be resource, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: ftell() expects parameter 1 to be resource, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: ftell() expects parameter 1 to be resource, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: ftell() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: ftell() expects parameter 1 to be resource, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: ftell() expects parameter 1 to be resource, object given in %s on line %d
-bool(false)
+NULL
 -- Testing ftell with closed/unset file handle --
 Warning: ftell(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: ftell() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
+NULL
 Done
-

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 1bc3b022183dfdf9c19fc17398b73f9d4f2860a3..cdd73f509307a2b949ab6ad1f5d9f7279629f3b6 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test fseek(), ftell() & rewind() functions : error conditions - rewind()
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
 --FILE--
 <?php
 
@@ -58,41 +56,40 @@ echo "Done\n";
 -- Testing rewind() with zero argument --
 
 Warning: rewind() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
+NULL
 -- Testing rewind() with more than expected number of arguments --
 
 Warning: rewind() expects exactly 1 parameter, 2 given in %s on line %d
-bool(false)
+NULL
 -- Testing rewind() with invalid arguments --
 -- Iteration 1 --
 
 Warning: rewind() expects parameter 1 to be resource, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: rewind() expects parameter 1 to be resource, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: rewind() expects parameter 1 to be resource, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: rewind() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: rewind() expects parameter 1 to be resource, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: rewind() expects parameter 1 to be resource, object given in %s on line %d
-bool(false)
+NULL
 -- Testing rewind() with closed/unset file handle --
 Warning: rewind(): %d is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: rewind() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
+NULL
 Done
-

diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index a792b72662bafe70757b823898d150297d62c861..444d18d4f6e23ce6dd425f9f4c31ebb7a8ec7299 100644 (file)
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test ftruncate() function : error conditions
---XFAIL--
-Pending completion of Unicode streams
 --FILE--
 <?php
 /*
@@ -13,7 +11,7 @@ echo "*** Testing ftruncate() : error conditions ***\n";
 
 $filename = dirname(__FILE__)."/ftruncate_error.tmp";
 $file_handle = fopen($filename, "w" );
-fwrite($file_handle, "Testing ftruncate error conditions \n");
+fwrite($file_handle, (binary)"Testing ftruncate error conditions \n");
 fflush($file_handle);
 echo "\n Initial file size = ".filesize($filename)."\n";
 
@@ -25,14 +23,12 @@ var_dump( ftruncate() );
 // arguments less than expected numbers
 var_dump( ftruncate( $file_handle ) );
 // check the first size 
-clearstatcache();
 var_dump( filesize($filename) );
 
 echo "-- Testing ftruncate() with more than expected number of arguments --\n";
 // more than expected number of arguments 
 var_dump( ftruncate($file_handle, 10, 20) );
-// check the first size
-clearstatcache(); 
+// check the first size 
 var_dump( filesize($filename) );
 
 // test invalid arguments : non-resources
@@ -57,16 +53,14 @@ echo "-- Testing ftruncate() with closed/unset file handle --\n";
 // ftruncate on close file handle
 fclose($file_handle);
 var_dump( ftruncate($file_handle,10) );
-// check the first size
-clearstatcache(); 
+// check the first size 
 var_dump( filesize($filename) );
 
 // ftruncate on a file handle which is unset
 $fp = fopen($filename, "w");
 unset($fp); //unset file handle
 var_dump( ftruncate(@$fp,10));
-// check the first size
-clearstatcache(); 
+// check the first size 
 var_dump( filesize($filename) );
 
 echo "Done\n";
@@ -83,41 +77,41 @@ unlink( $filename );
 -- Testing ftruncate() with less than expected number of arguments --
 
 Warning: ftruncate() expects exactly 2 parameters, 0 given in %s on line %d
-bool(false)
+NULL
 
 Warning: ftruncate() expects exactly 2 parameters, 1 given in %s on line %d
-bool(false)
+NULL
 int(36)
 -- Testing ftruncate() with more than expected number of arguments --
 
 Warning: ftruncate() expects exactly 2 parameters, 3 given in %s on line %d
-bool(false)
+NULL
 int(36)
 -- Testing ftruncate() with invalid file pointer --
 -- Iteration 1 --
 
 Warning: ftruncate() expects parameter 1 to be resource, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: ftruncate() expects parameter 1 to be resource, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: ftruncate() expects parameter 1 to be resource, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: ftruncate() expects parameter 1 to be resource, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: ftruncate() expects parameter 1 to be resource, object given in %s on line %d
-bool(false)
+NULL
 -- Testing ftruncate() with closed/unset file handle --
 
 Warning: ftruncate(): %d is not a valid stream resource in %s on line %d
@@ -125,7 +119,6 @@ bool(false)
 int(36)
 
 Warning: ftruncate() expects parameter 1 to be resource, null given in %s on line %d
-bool(false)
-int(0)
+NULL
+int(36)
 Done
-

diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt
index 881725679328f23d985b76f27c8d92c83a25948e..022e06bb40a3e0c91b8871f13695ec245b3d16c0 100644 (file)
--- a/ext/standard/tests/file/is_dir_variation2.phpt
+++ b/ext/standard/tests/file/is_dir_variation2.phpt
@@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 /* Testing is_dir() with dir, soft & hard link to dir,
      and with file, soft & hard link to file */
-      
+
 $file_path = dirname(__FILE__);
 
 echo "*** Testing is_dir() with dir and links to dir ***\n";
@@ -70,7 +70,7 @@ bool(true)
 -- With symlink --
 bool(true)
 -- With hardlink --
-Warning: link(): %s
+Warning: link(): %s in %s on line %d
 bool(false)
 
 *** Testing is_dir() with file and links to a file ***

diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt
index e7d704a20b3a98855de00aee52bf30f86958ec00..73ab385120098ed3b62c5c34d4081f50609effad 100755 (executable)
--- a/ext/standard/tests/file/lstat_stat_variation2.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation2.phpt
@@ -21,12 +21,13 @@ $file_path = dirname(__FILE__);
 require("file.inc");
 
 /* create temp directory */
-mkdir("$file_path/lstat_stat_variation1/");  // temp dir
+@rmdir("$file_path/lstat_stat_variation2/");  //ensure that dir doesn't exists 
+mkdir("$file_path/lstat_stat_variation2/");  // temp dir
 
 // renaming a directory and check stat
 echo "*** Testing stat() for directory after being renamed ***\n";
-$old_dirname = "$file_path/lstat_stat_variation1";
-$new_dirname = "$file_path/lstat_stat_variation1a";
+$old_dirname = "$file_path/lstat_stat_variation2";
+$new_dirname = "$file_path/lstat_stat_variation2a";
 $old_stat = stat($old_dirname);
 clearstatcache();
 var_dump( rename($old_dirname, $new_dirname) );
@@ -36,11 +37,8 @@ $new_stat = stat($new_dirname);
 var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
-// compare the two stats - all except ctime
-$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 
-                       "dev", "ino", "mode", "nlink", "uid", "gid",
-                       "rdev", "size", "atime", "mtime", "blksize", "blocks");
-var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
+// compare the two stats
+var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) );
 // clear the cache
 clearstatcache();
 
@@ -50,9 +48,9 @@ echo "\n--- Done ---";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-rmdir("$file_path/lstat_stat_variation1a");
+rmdir("$file_path/lstat_stat_variation2a");
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing stat() for directory after being renamed ***
 bool(true)
 bool(true)

diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
index 98ce6211dad8f8ac6ad6d38c7a41175376457650..3bee688d87f13cb99d7ce5d69e1a449577de5038 100644 (file)
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
@@ -5,7 +5,7 @@ Test symlink(), linkinfo(), link() and is_link() functions : error conditions -
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip no symlinks on Windows');
 }
-if (PHP_INT_SIZE != 4) {
+if (PHP_INT_SIZE != 4 ) {
   die("skip this test is for 32bit platform only");
 }
 ?>
@@ -42,7 +42,6 @@ var_dump( link($filename, $linkname, false) );
 //invalid arguments
 var_dump( link(NULL, $linkname) );  // NULL as filename
 var_dump( link('', $linkname) );  // empty string as filename
-var_dump( link(' ', $linkname) );  // space as filename
 var_dump( link(false, $linkname) );  // boolean false as filename
 var_dump( link($filename, NULL) );  // NULL as linkname
 var_dump( link($filename, '') );  // '' as linkname
@@ -58,7 +57,6 @@ var_dump( is_link($linkname, "/") );
 //invalid arguments
 var_dump( is_link(NULL) );  // NULL as linkname
 var_dump( is_link('') );  // empty string as linkname
-var_dump( is_link(' ') );  // space as linkname
 var_dump( is_link(false) );  // boolean false as linkname
 var_dump( is_link($filename) );  // file given to is_link
 
@@ -77,25 +75,22 @@ NULL
 Warning: link() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
-Warning: link(): No such file or directory in %s on line %d
-bool(false)
-
-Warning: link(): No such file or directory in %s on line %d
+Warning: link(): %s in %s on line %d
 bool(false)
 
 *** Testing is_link() for error conditions ***
@@ -109,6 +104,4 @@ bool(false)
 bool(false)
 bool(false)
 bool(false)
-bool(false)
 Done
-