diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 15:37:22 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 19:43:12 +0200 |
| commit | 7af945e271d042a4991c9510f78b6ff7ac43ac34 (patch) | |
| tree | 31d3b7a69f017cd532c5fe31ce1664d426384f82 /ext/standard/tests/file | |
| parent | afd534f1634e9a5d631afac39a9c9b09b1ba8b33 (diff) | |
| download | php-git-7af945e271d042a4991c9510f78b6ff7ac43ac34.tar.gz | |
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/standard/tests/file')
693 files changed, 2523 insertions, 2523 deletions
diff --git a/ext/standard/tests/file/004.phpt b/ext/standard/tests/file/004.phpt index f1fab47ac3..3fead8b215 100644 --- a/ext/standard/tests/file/004.phpt +++ b/ext/standard/tests/file/004.phpt @@ -20,7 +20,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $old_int = $int = time() / 1000; $ret = file_put_contents("TEST3", $int); echo "Float Test: "; @@ -30,7 +30,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = file_put_contents("TEST4", __FILE__); echo "Bool Test: "; if ($ret !== FALSE && md5(__FILE__) == md5_file("TEST4")) { @@ -39,7 +39,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = @file_put_contents("TEST5", $_SERVER); echo "Array Test: "; if ($ret !== FALSE && @md5(implode('', $_SERVER)) == md5_file("TEST5")) { diff --git a/ext/standard/tests/file/005_basic.phpt b/ext/standard/tests/file/005_basic.phpt index 5ed1118902..329fd15773 100644 --- a/ext/standard/tests/file/005_basic.phpt +++ b/ext/standard/tests/file/005_basic.phpt @@ -39,7 +39,7 @@ echo "\n*** Done ***\n"; unlink(dirname(__FILE__)."/005_basic.tmp"); unlink(dirname(__FILE__)."/005_basic"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing the basic functionality with file *** %d:%s:%s:%d:%d:%d %d:%s:%s:%d:%d:%d diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index 20ba3a7fc0..6ac22914db 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions : error conditions +Test fileatime(), filemtime(), filectime() & touch() functions : error conditions --FILE-- <?php /* @@ -56,7 +56,7 @@ var_dump( touch(__FILE__, 10, 100, 123) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** -- Testing with Non-existing files -- diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index 34558758e3..f3e78902e9 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -10,12 +10,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -31,13 +31,13 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -45,7 +45,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -120,7 +120,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -134,8 +134,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt index 7e5eedc2b1..f2bf19f6a3 100644 --- a/ext/standard/tests/file/005_variation.phpt +++ b/ext/standard/tests/file/005_variation.phpt @@ -13,12 +13,12 @@ if (getenv("SKIP_SLOW_TESTS")) { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,13 +34,13 @@ if (getenv("SKIP_SLOW_TESTS")) { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -48,7 +48,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -135,7 +135,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -149,8 +149,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 8508ecf7fb..63b3c1db67 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index 6d4ca5e83d..f365174a84 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 213442c15f..733be71126 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -29,7 +29,7 @@ unlink($filename); */ $path = dirname(__FILE__); -echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; +echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; fopen($path."/perm.tmp", "w"); var_dump( chmod($path."/perm.tmp", 0755 ) ); printf("%o", fileperms($path."/perm.tmp") ); diff --git a/ext/standard/tests/file/006_error.phpt b/ext/standard/tests/file/006_error.phpt index 04cc274ecc..c35eba2128 100644 --- a/ext/standard/tests/file/006_error.phpt +++ b/ext/standard/tests/file/006_error.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ) - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index b752d21fea..e2ec2f1a22 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ @@ -40,7 +40,7 @@ $count = 1; echo "-- Testing all permission from octal 0000 to octal 0777 on file and dir --\n"; for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Iteration $count --\n"; - var_dump( chmod($file_name, $mode) ); + var_dump( chmod($file_name, $mode) ); printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); @@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777); unlink(dirname(__FILE__)."/006_variation1.tmp"); rmdir(dirname(__FILE__)."/006_variation1"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index 7c5d2c838b..5219cf84c3 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ @@ -72,7 +72,7 @@ foreach($perms_array as $permission) { printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); - + var_dump( chmod($dir_name, $permission) ); printf("%o", fileperms($dir_name) ); echo "\n"; @@ -88,7 +88,7 @@ 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 *** diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt index ceb9b29943..9fb473b368 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -2,8 +2,8 @@ Test fopen(), fclose() & feof() functions: basic functionality --FILE-- <?php -/* - Prototype: resource fopen(string $filename, string $mode +/* + Prototype: resource fopen(string $filename, string $mode [, bool $use_include_path [, resource $context]] ); Description: Opens file or URL. diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 80cc657d5d..1e94e90359 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -13,8 +13,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com> Description: Closes an open file pointer Prototype: bool feof ( resource $handle ) - Description: Returns TRUE if the file pointer is at EOF or an error occurs - (including socket timeout); otherwise returns FALSE. + Description: Returns TRUE if the file pointer is at EOF or an error occurs + (including socket timeout); otherwise returns FALSE. */ echo "*** Testing error conditions for fopen(), fclsoe() & feof() ***\n"; @@ -29,7 +29,7 @@ $fp = fopen(__FILE__, "r"); fclose($fp); var_dump( fclose($fp) ); // closed handle var_dump( fclose(__FILE__) ); // invalid handle -var_dump( fclose() ); // zero argument +var_dump( fclose() ); // zero argument //feof() var_dump( feof($fp) ); // closed handle diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index 6cba146655..2731b3bdc9 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r" mode +Test fopen and fclose() functions - usage variations - "r" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation1.tmp"); diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt index 2981ef7d4c..3093535e64 100644 --- a/ext/standard/tests/file/007_variation10.phpt +++ b/ext/standard/tests/file/007_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+t" mode +Test fopen and fclose() functions - usage variations - "r+t" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation10.tmp"); diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt index 68a0e8ccd0..68b8396639 100644 --- a/ext/standard/tests/file/007_variation11-win32-mb.phpt +++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index a567b72b03..242b38cada 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt index c884f47f42..92ec32eb22 100644 --- a/ext/standard/tests/file/007_variation11.phpt +++ b/ext/standard/tests/file/007_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt index d3d26e2996..87bfc45c49 100644 --- a/ext/standard/tests/file/007_variation12-win32.phpt +++ b/ext/standard/tests/file/007_variation12-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt index c56605ac62..43ca4f78ff 100644 --- a/ext/standard/tests/file/007_variation12.phpt +++ b/ext/standard/tests/file/007_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt index fabcde90cc..6c6d22f64e 100644 --- a/ext/standard/tests/file/007_variation13-win32.phpt +++ b/ext/standard/tests/file/007_variation13-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt index 9d3e6265b5..6c416d1103 100644 --- a/ext/standard/tests/file/007_variation13.phpt +++ b/ext/standard/tests/file/007_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt index ebcad6d830..af07d1652a 100644 --- a/ext/standard/tests/file/007_variation14.phpt +++ b/ext/standard/tests/file/007_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+t" mode +Test fopen and fclose() functions - usage variations - "a+t" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+t") ); //Opening the non-existing file in "a+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation14.tmp"); diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index 1a2d530b65..38bd185bab 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xt" mode +Test fopen and fclose() functions - usage variations - "xt" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode /* Test fopen() and fclose(): Opening the file in "xt" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xt" mode, + checking for the warning msg when trying to open an existing file in "xt" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xt"); //Opening the existing data file in 'xt' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation15.tmp"); diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index 633299dedf..c48776a4cd 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+t" mode +Test fopen and fclose() functions - usage variations - "x+t" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+t" mode /* Test fopen() and fclose(): Opening the file in "x+t" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+t" mode, + checking for the warning msg when trying to open an existing file in "x+t" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+t"); //Opening the existing data file in "x+t" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation16.tmp"); diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt index d3408e9dbb..716dbbacb7 100644 --- a/ext/standard/tests/file/007_variation17.phpt +++ b/ext/standard/tests/file/007_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rb" mode +Test fopen and fclose() functions - usage variations - "rb" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation17.tmp"); diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt index 88350b8426..5d9b1ea212 100644 --- a/ext/standard/tests/file/007_variation18.phpt +++ b/ext/standard/tests/file/007_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+b" mode +Test fopen and fclose() functions - usage variations - "r+b" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation18.tmp"); diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt index 0731d454bb..ebb19a0b2e 100644 --- a/ext/standard/tests/file/007_variation19.phpt +++ b/ext/standard/tests/file/007_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wb" mode +Test fopen and fclose() functions - usage variations - "wb" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wb") ); //Opening the non-existing file in "wb" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation19.tmp"); diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt index deb51266ee..d456214c27 100644 --- a/ext/standard/tests/file/007_variation2.phpt +++ b/ext/standard/tests/file/007_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+" mode +Test fopen and fclose() functions - usage variations - "r+" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation2.tmp"); diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt index 3eddec4258..26c5bb7152 100644 --- a/ext/standard/tests/file/007_variation20.phpt +++ b/ext/standard/tests/file/007_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+b" mode +Test fopen and fclose() functions - usage variations - "w+b" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+b") ); //Opening the non-existing file in "w+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation20.tmp"); diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt index c70aaad784..62d7f84568 100644 --- a/ext/standard/tests/file/007_variation21.phpt +++ b/ext/standard/tests/file/007_variation21.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "ab" mode +Test fopen and fclose() functions - usage variations - "ab" mode --FILE-- <?php /* @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "ab") ); //Opening the non-existing file in "ab" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation21.tmp"); diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt index 63deee4f84..106cd4b6f4 100644 --- a/ext/standard/tests/file/007_variation22.phpt +++ b/ext/standard/tests/file/007_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+b" mode +Test fopen and fclose() functions - usage variations - "a+b" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+b") ); //Opening the non-existing file in "a+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation22.tmp"); diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index 1826296a06..10d5c84160 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xb" mode +Test fopen and fclose() functions - usage variations - "xb" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode /* Test fopen() and fclose(): Opening the file in "xb" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xb" mode, + checking for the warning msg when trying to open an existing file in "xb" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xb"); //Opening the existing data file in 'xb' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation23.tmp"); diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index d898ba7b52..b9c819f0a5 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+b" mode +Test fopen and fclose() functions - usage variations - "x+b" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+b" mode /* Test fopen() and fclose(): Opening the file in "x+b" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+b" mode, + checking for the warning msg when trying to open an existing file in "x+b" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+b"); //Opening the existing data file in "x+b" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation24.tmp"); diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt index f4ae03658f..b2a276cacf 100644 --- a/ext/standard/tests/file/007_variation3.phpt +++ b/ext/standard/tests/file/007_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w" mode +Test fopen and fclose() functions - usage variations - "w" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w") ); //Opening the non-existing file in "w" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation3.tmp"); diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt index 0dabc5b9ad..417974d3be 100644 --- a/ext/standard/tests/file/007_variation4.phpt +++ b/ext/standard/tests/file/007_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+" mode +Test fopen and fclose() functions - usage variations - "w+" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+") ); //Opening the non-existing file in "w+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation4.tmp"); diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt index 51e366d291..4c54f473b2 100644 --- a/ext/standard/tests/file/007_variation5.phpt +++ b/ext/standard/tests/file/007_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a" mode +Test fopen and fclose() functions - usage variations - "a" mode --FILE-- <?php /* @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "a") ); //Opening the non-existing file in "a" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation5.tmp"); diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt index 92c0171751..47bd3628d4 100644 --- a/ext/standard/tests/file/007_variation6.phpt +++ b/ext/standard/tests/file/007_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+" mode +Test fopen and fclose() functions - usage variations - "a+" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+") ); //Opening the non-existing file in "a+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation6.tmp"); diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 06bf9117f3..de750719ed 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x" mode +Test fopen and fclose() functions - usage variations - "x" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x" mode /* Test fopen() and fclose(): Opening the file in "x" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x" mode, + checking for the warning msg when trying to open an existing file in "x" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x"); //Opening the existing data file in 'x' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation7.tmp"); diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index fae6932048..a57c76bd67 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+" mode +Test fopen and fclose() functions - usage variations - "x+" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+" mode /* Test fopen() and fclose(): Opening the file in "x+" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+" mode, + checking for the warning msg when trying to open an existing file in "x+" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+"); //Opening the existing data file in "x+" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation8.tmp"); diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt index ab5f1ca01d..7d8ebbee91 100644 --- a/ext/standard/tests/file/007_variation9.phpt +++ b/ext/standard/tests/file/007_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rt" mode +Test fopen and fclose() functions - usage variations - "rt" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation9.tmp"); diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt index 5fd0f9659f..996b060cea 100644 --- a/ext/standard/tests/file/basename-win32.phpt +++ b/ext/standard/tests/file/basename-win32.phpt @@ -10,10 +10,10 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * proto string basename(string path [, string suffix]) * Function is implemented in ext/standard/string.c - */ + */ $file_paths = array ( /* simple paths */ array("bar"), @@ -33,15 +33,15 @@ $file_paths = array ( array("bar.zip", "bar.zip"), array("\\foo\\bar.zip", ".zip"), array("foo\\bar.zip", ".zip"), - array("\\bar.zip", ".zip"), + array("\\bar.zip", ".zip"), /* paths with suffix and trailing slashes with suffix removal*/ array("bar.zip\\", ".zip"), array("\\bar.zip\\", ".zip"), array("\\foo\\bar.zip\\", ".zip"), array("foo\\bar.zip\\", ".zip"), - array("\\bar.zip\\", ".zip"), - + array("\\bar.zip\\", ".zip"), + /* paths with basename only suffix, with suffix removal*/ array("\\.zip", ".zip"), array(".zip", ".zip"), @@ -90,7 +90,7 @@ $file_path_variations = array ( /* path with spaces */ array(" "), array(' '), - + /* empty paths */ array(""), array(''), @@ -104,8 +104,8 @@ function check_basename( $path_arrays ) { if( 1 == count($path) ) { // no suffix provided var_dump( basename($path[0]) ); } else { // path as well as suffix provided, - var_dump( basename($path[0], $path[1]) ); - } + var_dump( basename($path[0], $path[1]) ); + } } } @@ -116,13 +116,13 @@ echo "\n*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "\n*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( basename() ); // more than expected no. of arguments var_dump( basename("\\blah\\tmp\\bar.zip", ".zip", ".zip") ); -// passing invalid type arguments +// passing invalid type arguments $object = new stdclass; var_dump( basename( array("string\\bar") ) ); var_dump( basename( array("string\\bar"), "bar" ) ); diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt Binary files differindex c0e7498f14..a9b4389b5a 100644 --- a/ext/standard/tests/file/basename.phpt +++ b/ext/standard/tests/file/basename.phpt diff --git a/ext/standard/tests/file/basename_basic-win32.phpt b/ext/standard/tests/file/basename_basic-win32.phpt index f575c5aa69..ceccf9eef7 100644 --- a/ext/standard/tests/file/basename_basic-win32.phpt +++ b/ext/standard/tests/file/basename_basic-win32.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', diff --git a/ext/standard/tests/file/basename_basic.phpt b/ext/standard/tests/file/basename_basic.phpt index 68aefb2a3a..6354b2acd7 100644 --- a/ext/standard/tests/file/basename_basic.phpt +++ b/ext/standard/tests/file/basename_basic.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', diff --git a/ext/standard/tests/file/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt index 53c53cf8b9..3a123029c0 100644 --- a/ext/standard/tests/file/basename_error.phpt +++ b/ext/standard/tests/file/basename_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test basename() function : error conditions +Test basename() function : error conditions --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : error conditions ***\n"; diff --git a/ext/standard/tests/file/basename_variation1-win32.phpt b/ext/standard/tests/file/basename_variation1-win32.phpt index 0f4293e0b0..eb2a4ff497 100644 --- a/ext/standard/tests/file/basename_variation1-win32.phpt +++ b/ext/standard/tests/file/basename_variation1-win32.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation1.phpt b/ext/standard/tests/file/basename_variation1.phpt index 93582389d4..ea7cdfe8b7 100644 --- a/ext/standard/tests/file/basename_variation1.phpt +++ b/ext/standard/tests/file/basename_variation1.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation2-win32.phpt b/ext/standard/tests/file/basename_variation2-win32.phpt index 5e9961b98f..43d6de5060 100644 --- a/ext/standard/tests/file/basename_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_variation2-win32.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -35,13 +35,13 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt index 96cfd65057..195b98a6d3 100644 --- a/ext/standard/tests/file/basename_variation2.phpt +++ b/ext/standard/tests/file/basename_variation2.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -35,13 +35,13 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt index f01f550a7d..684e538d76 100644 --- a/ext/standard/tests/file/basename_variation3.phpt +++ b/ext/standard/tests/file/basename_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test basename() function : first parameter type variations +Test basename() function : first parameter type variations --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt index 88ce61a93d..2bb94870df 100644 --- a/ext/standard/tests/file/basename_variation4.phpt +++ b/ext/standard/tests/file/basename_variation4.phpt @@ -3,9 +3,9 @@ Test basename() function : second parameter type variation --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index fcd85489f3..abc6e47585 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -8,14 +8,14 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); $args = ' -n -dsafe_mode=off '; - + /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); echo "\n"; /* Binary Data Test */ - + if (substr(PHP_OS, 0, 3) != 'WIN') { $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; @@ -30,7 +30,7 @@ output_handler= } else { echo "Does not work\n"; } - + @unlink($tmpfile); ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt index 9d0568af33..9fe4d2d9ee 100644 --- a/ext/standard/tests/file/bug24482.phpt +++ b/ext/standard/tests/file/bug24482.phpt @@ -26,13 +26,13 @@ closedir($dh); if (count($dirs) != count($globdirs)) { echo "Directory count mismatch\n"; - + echo "glob found:\n"; - sort($globdirs); + sort($globdirs); var_dump($globdirs); - + echo "opendir/readdir/isdir found:\n"; - sort($dirs); + sort($dirs); var_dump($dirs); } else { echo "OK\n"; diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt index a68d5728d7..d1ad6b6526 100644 --- a/ext/standard/tests/file/bug26938.phpt +++ b/ext/standard/tests/file/bug26938.phpt @@ -6,14 +6,14 @@ $out = array(); $status = -1; $php = getenv('TEST_PHP_EXECUTABLE'); if (substr(PHP_OS, 0, 3) != 'WIN') { - exec($php . ' -n -r \'' + exec($php . ' -n -r \'' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' . ' print "\n";' . '}\'', $out, $status); } else { - exec($php . ' -n -r "' + exec($php . ' -n -r "' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 188080aa25..c3863972e5 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -4,8 +4,8 @@ Bug #27508 (userspace wrappers have bogus eof indicator) <?php # vim:ft=php class FileStream { public $fp; - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { $url = urldecode(substr($path, 9)); $this->fp = fopen($url, $mode); @@ -13,22 +13,22 @@ class FileStream { return true; } - function stream_read($count) + function stream_read($count) { return fread($this->fp, $count); } - function stream_write($data) + function stream_write($data) { return fwrite($this->fp, $data); } - function stream_tell() + function stream_tell() { return ftell($this->fp); } - function stream_eof() + function stream_eof() { if (!$this->fp) { return true; @@ -36,7 +36,7 @@ class FileStream { return feof($this->fp); } - function stream_seek($offset, $whence) + function stream_seek($offset, $whence) { return fseek($this->fp, $offset, $whence) == 0 ? true : false; } diff --git a/ext/standard/tests/file/bug30362.phpt b/ext/standard/tests/file/bug30362.phpt index 1c2b4be979..59fe02ad06 100644 --- a/ext/standard/tests/file/bug30362.phpt +++ b/ext/standard/tests/file/bug30362.phpt @@ -11,7 +11,7 @@ for ($i = 0; ($i < 10) && !feof($resource); ++$i ) { echo $line . "\n"; } fclose($resource); - + ?> --EXPECT-- 111 diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 3526b24973..184dff264f 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -7,7 +7,7 @@ include (dirname(__FILE__)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: include(%s): failed to open stream: %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index 5dc684a65d..fc14816f40 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -4,7 +4,7 @@ Bug #35781 (stream_filter_append() causes segfault) <?php $filename = dirname(__FILE__)."/bug35781.txt"; - + $fp = fopen($filename, "w"); stream_filter_append($fp, "string.rot13", -49); fwrite($fp, "This is a test\n"); @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug37158.phpt b/ext/standard/tests/file/bug37158.phpt index 48df46cc63..68a07c1539 100644 --- a/ext/standard/tests/file/bug37158.phpt +++ b/ext/standard/tests/file/bug37158.phpt @@ -4,8 +4,8 @@ Bug #37158 (if userspace stream is present, fread() reads in 8192 max, otherwise <?php class VariableStream { - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { return true; } @@ -33,7 +33,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "size of contents 1 = 20000" string(26) "size of contents 2 = 40960" Done diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt index d92289ef6e..0544e06692 100644 --- a/ext/standard/tests/file/bug38086.phpt +++ b/ext/standard/tests/file/bug38086.phpt @@ -37,7 +37,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) string(134) "Nabgure qnl Jura gur cnvaf bs yvsr jba'g one zl jnl diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 4a2953ea79..2868b6c60e 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index d0682186f9..7b187b332b 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 64c9f8d94a..318a2a3eb9 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index a72a00310d..0bcaeb2a89 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index c047a306ec..8cd8ca8a67 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index 00c29b28da..f12f2e0444 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug40374.phpt b/ext/standard/tests/file/bug40374.phpt index 327289eba2..c1f1bc5796 100644 --- a/ext/standard/tests/file/bug40374.phpt +++ b/ext/standard/tests/file/bug40374.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40374 (php_shutdown_temporary_directory() tries to free local value) +Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- <?php @@ -12,6 +12,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "%s" Done diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt index 6c7ff5bf4b..ea074fa4fd 100644 --- a/ext/standard/tests/file/bug41693.phpt +++ b/ext/standard/tests/file/bug41693.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41693 (scandir() allows empty directory names) +Bug #41693 (scandir() allows empty directory names) --FILE-- <?php @@ -7,7 +7,7 @@ var_dump(scandir('')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: scandir(): Directory name cannot be empty in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index f77468d96d..5411000fc1 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- OK Done diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt index 0e414f2321..ff49a554a4 100644 --- a/ext/standard/tests/file/bug66509.phpt +++ b/ext/standard/tests/file/bug66509.phpt @@ -4,9 +4,9 @@ Bug #66509 (copy() showing $context parameter as required) <?php $r = new \ReflectionFunction('copy'); - + foreach($r->getParameters() as $p) { - var_dump($p->isOptional()); + var_dump($p->isOptional()); } ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt index a2abbb7f35..feb4eb9acd 100644 --- a/ext/standard/tests/file/bug72035.phpt +++ b/ext/standard/tests/file/bug72035.phpt @@ -24,7 +24,7 @@ $cmd = "$cgi -n -C $fl"; $desc = array(0 => array("pipe", "r")); $proc = proc_open($cmd, $desc, $pipes, getcwd(), array()); if (is_resource($proc)) { - echo stream_get_contents($pipes[0]); + echo stream_get_contents($pipes[0]); proc_close($proc); } diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt index f4cae3b5cf..3b234c741f 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : error conditions +Test chmod() function : error conditions --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : error conditions ***\n"; diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index abfb3e6f4c..c7732a2926 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt index bc379ffcf7..2298f652ce 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); diff --git a/ext/standard/tests/file/chmod_variation2.phpt b/ext/standard/tests/file/chmod_variation2.phpt index b193acfaf7..c7a3db0fe7 100644 --- a/ext/standard/tests/file/chmod_variation2.phpt +++ b/ext/standard/tests/file/chmod_variation2.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 7c637b8560..13d2f1f667 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : first parameter variation +Test chmod() function : first parameter variation --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index 1fa5ad53ff..08dbc7ab08 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test chmod() function : second parameter variation +Test chmod() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; diff --git a/ext/standard/tests/file/copy_basic.phpt b/ext/standard/tests/file/copy_basic.phpt index 32788f9f74..d23a27839a 100644 --- a/ext/standard/tests/file/copy_basic.phpt +++ b/ext/standard/tests/file/copy_basic.phpt @@ -7,7 +7,7 @@ Test copy() function: basic functionality * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: to copy file from source to destination --\n"; +echo "*** Testing copy() function: to copy file from source to destination --\n"; var_dump( file_exists(__FILE__) ); diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index 96072ebfba..ad723370e4 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -7,7 +7,7 @@ Test copy() function: error conditions * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: error conditions --\n"; +echo "*** Testing copy() function: error conditions --\n"; /* Invalid args */ var_dump( copy("/no/file", "file") ); diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt index 4d0a97302a..c19c42956f 100644 --- a/ext/standard/tests/file/copy_variation1.phpt +++ b/ext/standard/tests/file/copy_variation1.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - destination file names(numerics/strings Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: In creation of destination file names containing numerics/strings +/* Test copy() function: In creation of destination file names containing numerics/strings and checking the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 98494af043..0a2eef2ea6 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - identical names +Test copy() function: usage variations - identical names --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -17,8 +17,8 @@ $file_handle = fopen($file, "w"); fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); fclose($file_handle); -var_dump( copy($file, $file) ); -var_dump( file_exists($file) ); +var_dump( copy($file, $file) ); +var_dump( file_exists($file) ); var_dump( filesize($file) ); echo "*** Done ***\n"; diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt index adee8e1c65..195b4f01fb 100644 --- a/ext/standard/tests/file/copy_variation11.phpt +++ b/ext/standard/tests/file/copy_variation11.phpt @@ -28,7 +28,7 @@ var_dump( filesize($dir) ); //size of destination before copy clearstatcache(); echo "\n-- Now applying copy() operation --\n"; -var_dump( copy($file, $dir) ); //expected: bool(false) +var_dump( copy($file, $dir) ); //expected: bool(false) var_dump( file_exists($file) ); //expected: bool(true) var_dump( file_exists($dir) ); //expected: bool(true) diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 1a39c1c6a9..996b702269 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - non existing src/dest Returns TRUE on success or FALSE on failure. */ -/* Test copy(): Trying to create a copy of non-existing source in an existing destination +/* Test copy(): Trying to create a copy of non-existing source in an existing destination and an existing source in non-existing destiantion */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index fbf5e7bf9e..3fa4f68348 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -40,7 +40,7 @@ chmod($dir, 0555); //dir without write permissions $dest = $dir."/copy_copy_variation15.tmp"; -var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); +var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); var_dump( file_exists($dir."/copy_copy_variation15_dir.tmp") ); var_dump( filesize($file) ); //size of source diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index d95d24adac..134828fa09 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt index e36fee1d66..1ef9da1ae6 100644 --- a/ext/standard/tests/file/copy_variation16.phpt +++ b/ext/standard/tests/file/copy_variation16.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 97f1665f01..55f1cdd2a7 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -32,11 +32,11 @@ $dest_file_name = $dir."/copy_copy_variation17.tmp"; $count = 1; foreach($src_file_names as $src_file_name) { - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); var_dump( file_exists($dest_file_name) ); if( file_exists($dest_file_name) ) { - var_dump( filesize($dest_file_name) ); //size of destination + var_dump( filesize($dest_file_name) ); //size of destination unlink($dest_file_name); } diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 53467af8a3..534902d7d4 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - stat after copy +Test copy() function: usage variations - stat after copy --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -27,13 +27,13 @@ $stat_before_copy = stat($src_file_name); clearstatcache(); echo "Copy operation => "; -var_dump( copy($src_file_name, $dest_file_name) ); +var_dump( copy($src_file_name, $dest_file_name) ); $stat_after_copy = stat($src_file_name); clearstatcache(); // compare all stat fields except access time -$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "mtime", "ctime", "blksize", "blocks"); diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index e818e294d8..5a127819d9 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp"; +$src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 4819d63e36..0e0b1dc47c 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index d99f5a8da3..60146fc774 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 68ce4a1680..f8be34610d 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 1c45c8c129..210be3fafd 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt Binary files differindex 3c8224da0a..3c10edb214 100644 --- a/ext/standard/tests/file/copy_variation4.phpt +++ b/ext/standard/tests/file/copy_variation4.phpt diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index baf7be470c..e64b082bde 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* Checking case sensitiveness */ - "COPY.tmp", + "COPY.tmp", "COPY.TMP", "CopY.TMP" ); diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index 8abc9c961a..8caef9cc79 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -12,7 +12,7 @@ if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) ) Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 524b21d377..9d4fb9d9c9 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt index 3213c6b436..2ce9bb3072 100644 --- a/ext/standard/tests/file/copy_variation6.phpt +++ b/ext/standard/tests/file/copy_variation6.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 63f57f3a25..52ad6892ae 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Trying to copy the links across dir paths given in various notations +/* Trying to copy the links across dir paths given in various notations and dirs having limited access */ echo "*** Testing copy() function: copying links across different directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index 824bed0c76..0a06d02909 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - destination file access perms +Test copy() function: usage variations - destination file access perms --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN') diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt index 87f85230b5..1e7f016e7f 100644 --- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt +++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test function fstat() on directory wrapper +Test function fstat() on directory wrapper --FILE-- <?php $d = dirname(__FILE__); diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index 61a6e33f5a..ed59582b1b 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/', + '/usr/', ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 8f1944e2c7..1934e8ed0d 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/' + '/usr/' ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/dirname_error.phpt b/ext/standard/tests/file/dirname_error.phpt index 515a3988d5..4181823b92 100644 --- a/ext/standard/tests/file/dirname_error.phpt +++ b/ext/standard/tests/file/dirname_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test dirname() function : error conditions +Test dirname() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : error conditions ***\n"; diff --git a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt index 283834e8ce..2bb227b5c2 100644 --- a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt +++ b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt @@ -19,7 +19,7 @@ if (strlen($s) >= 10000) { print "ERROR: " . PHP_EOL; var_dump(dirname($s)); var_dump(strlen($s)); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index 15041ffd53..fd7aec1210 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test dirname() function : usage variation +Test dirname() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : usage variation ***\n"; diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt index 6eef4b4a77..a048af6ccb 100644 --- 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 diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 2904ff9a5b..b8a91a7953 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -10,23 +10,23 @@ memory_limit=32M <?php /* * 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 + * Description: Given a string containing a directory, this function + * will return the number of bytes available on the corresponding * filesystem or disk partition */ $file_path = dirname(__FILE__); echo "*** Testing with existing directory ***\n"; -var_dump( disk_free_space($file_path) ); -var_dump( diskfreespace($file_path) ); +var_dump( disk_free_space($file_path) ); +var_dump( diskfreespace($file_path) ); 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 ); +$space1 = disk_free_space($file_path.$dir); +var_dump( $space1 ); $fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); $data = str_repeat("x", 0xffff); @@ -34,8 +34,8 @@ fwrite($fh, (binary)$data); fclose($fh); echo "\n Free Space after writing to a file\n"; -$space2 = disk_free_space($file_path.$dir); -var_dump( $space2 ); +$space2 = disk_free_space($file_path.$dir); +var_dump( $space2 ); if($space1 > $space2 ) echo "\n Free Space Value Is Correct\n"; @@ -45,7 +45,7 @@ else { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); +var_dump( disk_free_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt index 21e7bf653d..27a1c0def6 100644 --- a/ext/standard/tests/file/disk_free_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * 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 + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index ddd25a35db..4d0b5497ad 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?php /* * 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 + * Description: Given a string containing a directory, this function will + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index adb1acaf82..e59079eac0 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -4,7 +4,7 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function + * Description: Given a string containing a directory, this function * will return the number of bytes available on the corresponding * filesystem or disk partition */ @@ -12,11 +12,11 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_free_space($file_path."/..") ); -var_dump( diskfreespace($file_path."/..") ); +var_dump( disk_free_space($file_path."/..") ); +var_dump( diskfreespace($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_free_space($file_path); +$return_value = disk_free_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt index d211f39437..d4029a9222 100644 --- a/ext/standard/tests/file/disk_total_space_basic.phpt +++ b/ext/standard/tests/file/disk_total_space_basic.phpt @@ -4,7 +4,7 @@ Test disk_total_space() function : basic functionality <?php /* * Prototype: float disk_total_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 total number of bytes on the corresponding filesyatem * or disk partition. */ diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt index a3ea183194..3fe54b5320 100644 --- a/ext/standard/tests/file/disk_total_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * 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 + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt index d986f779ba..7aaeed3f30 100644 --- a/ext/standard/tests/file/disk_total_space_error.phpt +++ b/ext/standard/tests/file/disk_total_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?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 + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index ba2ceb2d1b..4e94774a74 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -4,18 +4,18 @@ Testing disk_total_space() functions : Usage Variations. <?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 + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition. */ $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_total_space($file_path."/..") ); +var_dump( disk_total_space($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_total_space($file_path); +$return_value = disk_total_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; @@ -54,7 +54,7 @@ foreach($dirs_arr as $dir1) { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); +var_dump( disk_total_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt index 78774e58e9..2fc2e4b855 100644 --- a/ext/standard/tests/file/feof_basic.phpt +++ b/ext/standard/tests/file/feof_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test feof() function : basic functionality +Test feof() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool feof(resource fp) - * Description: Test for end-of-file on a file pointer + * Description: Test for end-of-file on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzeof */ @@ -31,7 +31,7 @@ while (!feof($h)) { $lastline = fgets($h); } echo $previousLine; -var_dump($lastline); // this should be false +var_dump($lastline); // this should be false fclose($h); $tmpFile2 = __FILE__.".tmp2"; diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt index a334d8fea1..8cf9981b34 100644 --- a/ext/standard/tests/file/fflush_error.phpt +++ b/ext/standard/tests/file/fflush_error.phpt @@ -21,7 +21,7 @@ $filename = "$file_path/fflush_error.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 80b8dedb65..a085e47a52 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation私はガラスを食べられます1.tmp"; +$file_name = "$file_path/fflush_variation私はガラスを食べられます1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 0b6b096a34..b0e85fea17 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 2ecf7ea919..7c91a7a23d 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,7 +31,7 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); @@ -39,19 +39,19 @@ foreach( $file_types as $type ) { exit("Error:failed to open file $file_name"); // filling the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 651c716439..2b28367b00 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -35,14 +35,14 @@ foreach( $file_types as $type ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + //fill the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); - + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); + //close the file fclose($file_handle); - + // creating the sym link var_dump( symlink($file_name, $symlink_name) ); $file_handle = fopen($symlink_name, $mode); @@ -50,10 +50,10 @@ foreach( $file_types as $type ) { exit("Error:failed to open link $symlink_name"); // filling data into the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); - + // reading the data from the file var_dump( readfile($symlink_name) ); diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 6dfd49bc40..73f27eae31 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -29,28 +29,28 @@ $count = 1; foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type data --\n"; foreach( $file_modes as $mode ) { - + // creating the file $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - // fill the fill with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); + // fill the fill with some data if mode is append mode + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); // fclose($file_handle); - + // creating hard link to the file var_dump( link($file_name, $link_name) ); - + // opening the file in different modes $file_handle = fopen($link_name, $mode); if($file_handle == false) exit("Error:failed to open link $link_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index f98616c3d8..29faeab3cb 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fflush() function: usage variations - file opened in read-only mode +Test fflush() function: usage variations - file opened in read-only mode --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); @@ -14,7 +14,7 @@ require $file_path.'/file.inc'; echo "*** Testing fflush(): with file handles of files opened in various read modes ***\n"; $file_modes = array("r", "rb", "rt"); -$file_name = "$file_path/fflush_variation4.tmp"; +$file_name = "$file_path/fflush_variation4.tmp"; $count = 1; @@ -26,14 +26,14 @@ foreach( $file_modes as $mode ) { if($file_handle == false) exit("Error:failed to open file $file_name"); fclose($file_handle); - + // opening the file in different read modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); var_dump( fflush($file_handle) ); fclose($file_handle); - + unlink($file_name); $count++; } diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 7851e432f3..01f01f2361 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -6,7 +6,7 @@ Test fgetc() function : basic functionality Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : basic operations ***\n"; @@ -20,9 +20,9 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo "--- Outerloop iteration "; echo $outerloop_counter + 1; echo " ---\n"; - // create file file + // create file file create_files(dirname(__FILE__), 1, $file_content_types[$outerloop_counter], 0755, 1, "w", "fgetc_basic", 1); - + //open the file in different modes and check the working of fgetc for($innerloop_counter = 0; $innerloop_counter < count($file_modes); $innerloop_counter++) { echo "-- Innerloop iteration "; @@ -30,7 +30,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo " of Outerloop Iteration "; echo $outerloop_counter + 1; echo " --\n"; - + // open the file using the $file_modes $filename = dirname(__FILE__)."/fgetc_basic1.tmp"; // file name that is created by create_files echo "-- Testing fgetc() : file opened using $file_modes[$innerloop_counter] mode --\n"; @@ -40,20 +40,20 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou exit(); } - // perform the read file at least 6 char and check + // perform the read file at least 6 char and check for( $counter = 1; $counter <= 6; $counter++ ) { // read data from the file and check, file pointer position, feof etc var_dump( fgetc($file_handle) ); // read a char var_dump( ftell($file_handle) ); // file pointer position var_dump( feof($file_handle) ); // is it eof() - var_dump($file_handle); // dump the $file_handle to see if any thing got modifed + var_dump($file_handle); // dump the $file_handle to see if any thing got modifed } // end of for - - // close the file + + // close the file fclose ( $file_handle); } // end of innerloop for - + // delete the file delete_files(dirname(__FILE__), 1, "fgetc_basic", 1, ".tmp"); diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 03258cac5d..9930f7a4e5 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -6,12 +6,12 @@ Test fgetc() function : usage variations - read when file pointer at EOF Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with file whose file pointer is pointing to EOF --\n"; -// create a file +// create a file create_files(dirname(__FILE__), 1, "text_with_new_line", 0755, 1, "w", "fgetc_variation"); $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; @@ -20,9 +20,9 @@ $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; $file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t"); $loop_counter =0; for(; $loop_counter < count($file_modes); $loop_counter++) { - // print the hearder + // print the hearder echo "-- File opened in mode : $file_modes[$loop_counter] --\n"; - // open the file + // open the file $file_handle = fopen ($filename, $file_modes[$loop_counter]); if (!$file_handle) { echo "Error: failed to open file $filename! \n"; @@ -33,11 +33,11 @@ for(; $loop_counter < count($file_modes); $loop_counter++) { var_dump( fseek($file_handle, 0, SEEK_END) ); // set file pointer to eof var_dump( feof($file_handle) ); // expected false var_dump( ftell($file_handle) ); // ensure that file pointer is at eof - var_dump( fgetc($file_handle) ); // try n read a char, none expected + var_dump( fgetc($file_handle) ); // try n read a char, none expected var_dump( feof($file_handle) ); // ensure that file pointer is at eof var_dump( ftell($file_handle) ); // file pointer position - // close the file handle + // close the file handle fclose($file_handle); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt index 169f00ac2c..d444209af4 100644 --- a/ext/standard/tests/file/fgetc_variation2.phpt +++ b/ext/standard/tests/file/fgetc_variation2.phpt @@ -11,8 +11,8 @@ Test fgetc() function : usage variations - closed handle - closed file handle - unset file handle */ - -// include the header for common test function + +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 64efaa6cfd..0d795688ad 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -12,7 +12,7 @@ Test fgetc() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() with file opened in write only mode ***\n"; @@ -31,8 +31,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -44,7 +44,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index cb6f0cdce5..717e78010b 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetc() function : usage variations - different read modes +Test fgetc() function : usage variations - different read modes --FILE-- <?php /* @@ -13,8 +13,8 @@ Test fgetc() function : usage variations - different read modes echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with files opened with different read modes --\n"; -$file_modes = array( "a+", "a+b", "a+t", - "x+", "x+b", "x+t", +$file_modes = array( "a+", "a+b", "a+t", + "x+", "x+b", "x+t", "w+", "w+b", "w+t" ); $filename = dirname(__FILE__)."/fgetc_variation4.tmp"; @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file, at least 7 chars @@ -45,7 +45,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt index 969c9c0348..5fc8108a62 100644 --- a/ext/standard/tests/file/fgetcsv_variation1.phpt +++ b/ext/standard/tests/file/fgetcsv_variation1.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with all parameters specified echo "*** Testing fgetcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation1.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,22 +67,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with max length + + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt index 60a401bb86..41388fb00c 100644 --- a/ext/standard/tests/file/fgetcsv_variation10.phpt +++ b/ext/standard/tests/file/fgetcsv_variation10.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - file pointer pointing to EOF +Test fgetcsv() : usage variations - file pointer pointing to EOF --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,7 +11,7 @@ Test fgetcsv() : usage variations - file pointer pointing to EOF echo "*** Testing fgetcsv() : with file pointer pointing to EOF ***\n"; -/* the array is with three elements in it. Each element should be read as +/* the array is with three elements in it. Each element should be read as 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation10.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,34 +58,34 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - // set the file pointer to EOF - var_dump( fseek($file_handle, 0, SEEK_END) ); + // set the file pointer to EOF + var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); // with default args + var_dump( fgetcsv($file_handle) ); // with default args // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt index d5741248fb..c555cf532a 100644 --- a/ext/standard/tests/file/fgetcsv_variation11.phpt +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt @@ -2,18 +2,18 @@ Test fgetcsv() : usage variations - with different enclosure but same delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() by reading from a file when different enclosure that is not +/* Testing fgetcsv() by reading from a file when different enclosure that is not present in the data being read and delimiter which is present in the data */ echo "*** Testing fgetcsv() : with different enclosure but same delimiter char ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,7 +33,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation11.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt index 3168684468..6ae6ae61b1 100644 --- a/ext/standard/tests/file/fgetcsv_variation12.phpt +++ b/ext/standard/tests/file/fgetcsv_variation12.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) +Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -49,7 +49,7 @@ foreach ($csv_lists as $csv_list) { $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; fwrite($file_handle, $csv_field . "\n"); - + // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its // working when only a blank line is read @@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -78,12 +78,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt index f191a26379..b7c7b6b373 100644 --- a/ext/standard/tests/file/fgetcsv_variation13.phpt +++ b/ext/standard/tests/file/fgetcsv_variation13.phpt @@ -3,7 +3,7 @@ Test fgetcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -19,7 +19,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation13.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -37,7 +37,7 @@ $loop_counter = 1; fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -45,10 +45,10 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle) ); @@ -60,7 +60,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt index 14c72a24b1..44eb066e9c 100644 --- a/ext/standard/tests/file/fgetcsv_variation14.phpt +++ b/ext/standard/tests/file/fgetcsv_variation14.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - reading the blank line +Test fgetcsv() : usage variations - reading the blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -18,7 +18,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation14.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -36,7 +36,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -44,8 +44,8 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -65,7 +65,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt index c6859497ee..212f197745 100644 --- a/ext/standard/tests/file/fgetcsv_variation15.phpt +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default enclosure echo "*** Testing fgetcsv() : with default enclosure ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -28,7 +28,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation15.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -61,8 +61,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt index 9cfdd72460..4768cf2770 100644 --- a/ext/standard/tests/file/fgetcsv_variation16.phpt +++ b/ext/standard/tests/file/fgetcsv_variation16.phpt @@ -2,19 +2,19 @@ Test fgetcsv() : usage variations - with default enclosure & length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character - and length value equal to zero +/* Testing fgetcsv() to read a file when provided with default enclosure character + and length value equal to zero */ echo "*** Testing fgetcsv() : with default enclosure & length as 0 ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation16.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,14 +63,14 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); - var_dump( fgetcsv($file_handle, 0, $delimiter) ); + var_dump( fgetcsv($file_handle, 0, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt index b8d918659f..75cb1c5ced 100644 --- a/ext/standard/tests/file/fgetcsv_variation17.phpt +++ b/ext/standard/tests/file/fgetcsv_variation17.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure & length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -13,8 +13,8 @@ Test fgetcsv() : usage variations - with default enclosure & length less than li echo "*** Testing fgetcsv() : with default enclosure & length less than line size ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation17.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,29 +63,29 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - // read rest of the line + // read rest of the line var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt index f0ebcb7fae..a5889ee77d 100644 --- a/ext/standard/tests/file/fgetcsv_variation18.phpt +++ b/ext/standard/tests/file/fgetcsv_variation18.phpt @@ -2,19 +2,19 @@ Test fgetcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character +/* Testing fgetcsv() to read a file when provided with default enclosure character and with delimiter character which is not in the line being read by fgetcsv() */ echo "*** Testing fgetcsv() : with default enclosure and different delimiter ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation18.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,24 +63,24 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use different delimiter than existing in file + + // use different delimiter than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; var_dump( fgetcsv($file_handle, 1024, $del) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt index cb510099bd..5200b5e8e1 100644 --- a/ext/standard/tests/file/fgetcsv_variation19.phpt +++ b/ext/standard/tests/file/fgetcsv_variation19.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read a file when provided with default enclosure character - and with delimiter of two characters + Testing fgetcsv() to read a file when provided with default enclosure character + and with delimiter of two characters */ echo "*** Testing fgetcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation19.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -64,24 +64,24 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use delimiter & enclosure char of two chars + + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; var_dump( fgetcsv($file_handle, 1024, $del) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt index d1e446d1f9..40fb910cf9 100644 --- a/ext/standard/tests/file/fgetcsv_variation2.phpt +++ b/ext/standard/tests/file/fgetcsv_variation2.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - with length as 0 +Test fgetcsv() : usage variations - with length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with length as 0 echo "*** Testing fgetcsv() : with length as 0 ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation2.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use length as 0 + + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt index 70bd8acbb0..5027d13a78 100644 --- a/ext/standard/tests/file/fgetcsv_variation20.phpt +++ b/ext/standard/tests/file/fgetcsv_variation20.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with default enclosure, line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read a line without any csv fields from a file when provided with default enclosure value */ - + echo "*** Testing fgetcsv() : with default enclosure, line without any csv fields ***\n"; $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -34,11 +34,11 @@ $loop_counter = 1; echo "Error: failed to create file $filename!\n"; exit(); } - // write line of text + // write line of text fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024) ); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt index ae8c4f1ef6..6acbbf4f88 100644 --- a/ext/standard/tests/file/fgetcsv_variation21.phpt +++ b/ext/standard/tests/file/fgetcsv_variation21.phpt @@ -2,13 +2,13 @@ Test fgetcsv() : usage variations - with default enclosure, blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read a file containing blank line when provided with + Testing fgetcsv() to read a file containing blank line when provided with default enclosure argument */ @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation21.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -38,7 +38,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is a blank line to see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024, '+') ); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt index 9f35c1c1c3..ed4e129eb5 100644 --- a/ext/standard/tests/file/fgetcsv_variation22.phpt +++ b/ext/standard/tests/file/fgetcsv_variation22.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointin echo "*** Testing fgetcsv() : with default enclosure, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation22.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation23.phpt b/ext/standard/tests/file/fgetcsv_variation23.phpt index b766f1e062..a9b51f06a5 100644 --- a/ext/standard/tests/file/fgetcsv_variation23.phpt +++ b/ext/standard/tests/file/fgetcsv_variation23.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - empty file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -12,7 +12,7 @@ Test fgetcsv() : usage variations - empty file echo "*** Testing fgetcsv() : reading from file which is having zero content ***\n"; // try reading from file which is having zero content -// create the file and then open in read mode and try reading +// create the file and then open in read mode and try reading $filename = dirname(__FILE__) . '/fgetcsv_variation23.tmp'; $fp = fopen ($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt index cdfadceb70..154c6f9104 100644 --- a/ext/standard/tests/file/fgetcsv_variation24.phpt +++ b/ext/standard/tests/file/fgetcsv_variation24.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various write modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read from a file opened in various write modes and + Testing fgetcsv() to read from a file opened in various write modes and enclosure argument with two characters */ echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -80,12 +80,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt index 52e830cb5b..9ba0aa15ed 100644 --- a/ext/standard/tests/file/fgetcsv_variation25.phpt +++ b/ext/standard/tests/file/fgetcsv_variation25.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with enclosure and delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation25.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt index c042eb4931..53077f3372 100644 --- a/ext/standard/tests/file/fgetcsv_variation26.phpt +++ b/ext/standard/tests/file/fgetcsv_variation26.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug #42036) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug echo "*** Testing fgetcsv() : reading the files opened in write only mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -38,7 +38,7 @@ foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { // create the file and add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); - + if ( !$file_handle ) { echo "Error: failed to create file $filename!\n"; exit(); @@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -56,22 +56,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with max length + + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt index a215e90a3f..ff10286b4c 100644 --- a/ext/standard/tests/file/fgetcsv_variation27.phpt +++ b/ext/standard/tests/file/fgetcsv_variation27.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with delimiter and no enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and no enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation27.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt index 4e6fed3171..4facbcf1ea 100644 --- a/ext/standard/tests/file/fgetcsv_variation28.phpt +++ b/ext/standard/tests/file/fgetcsv_variation28.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with neither enclosure and nor delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with neither delimiter nor enclosure argument */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation28.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt index 0420860321..df4ee6c6f5 100644 --- a/ext/standard/tests/file/fgetcsv_variation29.phpt +++ b/ext/standard/tests/file/fgetcsv_variation29.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with only file handle as argument, file poin echo "*** Testing fgetcsv() : with file handle as only argument and file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation29.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -57,22 +57,22 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); + var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt index 8cde39da20..20507973db 100644 --- a/ext/standard/tests/file/fgetcsv_variation3.phpt +++ b/ext/standard/tests/file/fgetcsv_variation3.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with delimiter as NULL echo "*** Testing fgetcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation3.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 1024, NULL, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation30.phpt b/ext/standard/tests/file/fgetcsv_variation30.phpt index e474b2d546..2cb570c8dc 100644 --- a/ext/standard/tests/file/fgetcsv_variation30.phpt +++ b/ext/standard/tests/file/fgetcsv_variation30.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer po echo "*** Testing fgetcsv() : with file handle and length arguments, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation30.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024) ); + var_dump( fgetcsv($file_handle, 1024) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt index 7d1e90e1f9..d4e3d8a43d 100644 --- a/ext/standard/tests/file/fgetcsv_variation31.phpt +++ b/ext/standard/tests/file/fgetcsv_variation31.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file +Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with length and enclosure, file pointer poin echo "*** Testing fgetcsv() : with enclosure argument, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation31.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -57,23 +57,23 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); $enc = 'z'; - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -81,7 +81,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt index da945daa70..e42163bd98 100644 --- a/ext/standard/tests/file/fgetcsv_variation4.phpt +++ b/ext/standard/tests/file/fgetcsv_variation4.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with enclosure as NULL echo "*** Testing fgetcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation4.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, NULL) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt index d3564e4015..ff18d6fe13 100644 --- a/ext/standard/tests/file/fgetcsv_variation5.phpt +++ b/ext/standard/tests/file/fgetcsv_variation5.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with delimiter & enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read from a file when provided with delimiter and + Testing fgetcsv() to read from a file when provided with delimiter and enclosure values both as NULL */ echo "*** Testing fgetcsv() : with delimiter & enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation5.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,8 +69,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -84,7 +84,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt index 844dd7c519..95db326598 100644 --- a/ext/standard/tests/file/fgetcsv_variation6.phpt +++ b/ext/standard/tests/file/fgetcsv_variation6.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with the length argument value less than the line size */ echo "*** Testing fgetcsv() : with length less than line size ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation6.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,12 +69,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -90,7 +90,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt index 271a55b009..2854dc766f 100644 --- a/ext/standard/tests/file/fgetcsv_variation7.phpt +++ b/ext/standard/tests/file/fgetcsv_variation7.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default arguments value echo "*** Testing fgetcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation7.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use only default arguments + // use only default arguments fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt index bf06d29b40..cd518cb144 100644 --- a/ext/standard/tests/file/fgetcsv_variation8.phpt +++ b/ext/standard/tests/file/fgetcsv_variation8.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with values of delimiter and enclosure that are not present in the line read by fgetcsv() */ echo "*** Testing fgetcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation8.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,12 +70,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use different delimiter and enclosure than existing in file + // use different delimiter and enclosure than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; $enc = "%"; @@ -83,12 +83,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt index 294241e6cd..dd0d788f6c 100644 --- a/ext/standard/tests/file/fgetcsv_variation9.phpt +++ b/ext/standard/tests/file/fgetcsv_variation9.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with different delimiter but same enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when the delimiter argument value is not present in the line being read by the fgetcsv() */ echo "*** Testing fgetcsv() : with different delimiter but same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation9.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,11 +69,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use different delimiter but same enclosure char fseek($file_handle, 0, SEEK_SET); $del = "+"; @@ -86,7 +86,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 9865f1fc9a..90515577c4 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { } echo "-- fgets() with default length, file pointer at 0 --\n"; - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index 5a62252b78..f139d33294 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -17,13 +17,13 @@ echo "-- Testing fgets() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgets($fp, 10, $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgets() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fgets($fp, $len) ); $len = -10; var_dump( fgets($fp, $len) ); -$len = 1; +$len = 1; var_dump( fgets($fp, $len) ); // return length - 1 always, expect false diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index 68a20e8992..78fa390ead 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -11,7 +11,7 @@ Test fgets() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() with file opened in write only mode ***\n"; @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -43,7 +43,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index 201755b69c..fcd85ce6e0 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -11,8 +11,8 @@ Test fgets() function : usage variations - closed handle - closed file handle - unset file handle */ - -// include the header for common test function + +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index b39ba0c6af..655e25523b 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { /* create files with $file_content_type */ $file_handle = fopen($filename, $file_mode); $data = fill_file($file_handle, $file_content_type, 50); - + if ( !$file_handle ) { echo "Error: failed to open file $filename!"; exit(); @@ -40,7 +40,7 @@ foreach($file_modes as $file_mode) { rewind($file_handle); var_dump( ftell($file_handle) ); - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt index b5786df58c..a172a72779 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt index 6d2bbf6caf..99620d9f02 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index 4ffa3f1975..0c678c257d 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index 4a1ed9f039..261db1d12c 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index 0334050aaa..c14659a136 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index 69215d9020..dba2b76ca7 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgetss.phpt b/ext/standard/tests/file/fgetss.phpt index 2e2bb6b71c..907eca72db 100644 --- a/ext/standard/tests/file/fgetss.phpt +++ b/ext/standard/tests/file/fgetss.phpt @@ -38,7 +38,7 @@ var_dump(fgetss($fp, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(18) "askasdfasdfaaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 58dd00c11a..2ae3abf355 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -36,7 +36,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECTF-- +--EXPECTF-- string(21) "askasdfasdf<b>aaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index 4c5881d588..e7b6a5776d 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -9,7 +9,7 @@ Test fgetss() function : Basic functionality - read modes only /* test fgetss with all read modes */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : Basic operations ***\n"; @@ -32,33 +32,33 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "\n-- Testing fgetss() with file opened using $file_modes[$mode_counter] mode --\n"; /* create an empty file and write the strings with tags */ - $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; + $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; exit(); } - - rewind($file_handle); - /* read entire file and strip tags */ + + rewind($file_handle); + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 --\n"; var_dump( fgetss($file_handle) ); // no length and allowable tags provided, reads entire file var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + rewind($file_handle); /* read entire file and strip tags tags */ echo "-- fgets() with length = 30, file pointer at 0 --\n"; var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 7edf7bcbd1..3a3fbb09ab 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -32,7 +32,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2私はガラスを食べられます.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2私はガラスを食べられます.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index ca6f40cb94..ff8f4d6b55 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -32,7 +32,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 86be24810e..ccc02966b6 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -30,7 +30,7 @@ is a heredoc string. <pg>ksklnm@@$$&$&^%&^%&^%&</pg> <html> html </html> <?php echo "php"; ?> EOT; -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -45,7 +45,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -64,11 +64,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 2640d27900..7c99f73a25 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -17,14 +17,14 @@ echo "-- Testing fgetss() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgetss($fp, 100, '<p><a>', $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgetss() with invalid length arguments --\n"; -$len = 0; +$len = 0; $allowable_tags = '<p><a>'; var_dump( fgetss($fp, $len, $allowable_tags) ); $len = -10; var_dump( fgetss($fp, $len, $allowable_tags) ); -$len = 1; +$len = 1; var_dump( fgetss($fp, $len, $allowable_tags) ); // return length - 1 always, expect false // test invalid arguments : non-resources diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index 7cd49333bf..b189b1b5a1 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -55,23 +55,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 5a0556a198..54826fad66 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -51,23 +51,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index a436e8c4b3..43bebab6e1 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -7,7 +7,7 @@ Test fgetss() function : usage variations - read modes Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); /*Test fgetss() with all read modes , reading line by line with allowable tags: <test>, <html>, <?> */ @@ -27,7 +27,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -37,7 +37,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + /* rewind the file and read the file line by line with allowable tags */ echo "-- Reading line by line with allowable tags: <test>, <html>, <?> --\n"; rewind($file_handle); @@ -60,10 +60,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index fc7561dff5..1987592bbc 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -39,7 +39,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -54,7 +54,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -70,11 +70,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index e6f63c310f..4e3bc73fbe 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -35,7 +35,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -50,7 +50,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index b93bc6afd0..f455e8b3af 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -30,7 +30,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -40,7 +40,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + echo "-- Reading when file pointer points to EOF --\n"; var_dump( fseek($file_handle,0,SEEK_END) ); // now file pointer at end var_dump( ftell($file_handle) ); //ensure file pointer at end @@ -64,10 +64,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle, 80, "<test>, <html>, <?>") ); var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt index a2d4a705e8..52eaef629a 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -37,7 +37,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -70,11 +70,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index c499d598b2..91d0b5c114 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -34,7 +34,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -67,11 +67,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index 97a592fd0c..77d87dd820 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -2,7 +2,7 @@ Test file() function : basic functionality --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array * Returns the file in an array diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index 31189672d3..fdf02fe109 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -2,7 +2,7 @@ Test file() function : error conditions --FILE-- <?php -/* +/* Prototype: array file ( string filename [,int use-include_path [,resource context]] ); Description: Reads entire file into an array Returns the file in an array @@ -18,7 +18,7 @@ var_dump( file($filename, $filename, $filename, $filename) ); // more than expe var_dump( file($filename, "INCORRECT_FLAG", NULL) ); // Incorrect flag var_dump( file($filename, 10, NULL) ); // Incorrect flag -var_dump( file("temp.tmp") ); // non existing filename +var_dump( file("temp.tmp") ); // non existing filename fclose($file_handle); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/file_exists_error.phpt b/ext/standard/tests/file/file_exists_error.phpt index b20b2fe3a0..7d98e4d0a5 100644 --- a/ext/standard/tests/file/file_exists_error.phpt +++ b/ext/standard/tests/file/file_exists_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_exists() function : error conditions +Test file_exists() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 35c86a2808..7e3fda394d 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : usage variations ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt index 631a138a07..f06628f516 100644 --- a/ext/standard/tests/file/file_get_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_error.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -28,7 +28,7 @@ print( file_get_contents($file_path."/file1.tmp", false, $file_handle, 1, 2, "ex echo "\n-- Testing for invalid negative maxlen values --"; var_dump( file_get_contents($file_path."/file1.tmp", FALSE, $file_handle, 0, -5) ); - + delete_files($file_path, 1); fclose($file_handle); unlink($file_path."/file_put_contents_error.tmp"); diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt index 72fe121533..b2a09798e3 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt @@ -3,7 +3,7 @@ Test file-get_contents() and file_put_contents() functions : error conditions --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -31,7 +31,7 @@ print( file_get_contents("abc.tmp", false, $file_handle, 1, 2, "extra_argument") echo "\n-- Testing for invalid negative maxlen values --"; file_put_contents($file_path."/file_put_contents1.tmp", "Garbage data in the file"); var_dump( file_get_contents($file_path."/file_put_contents1.tmp", FALSE, NULL, 0, -5) ); - + fclose($file_handle); echo "\n*** Done ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt index 1bac1c9864..1ad7f5203c 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -36,7 +36,7 @@ echo "--- Done ---"; ?> --CLEAN-- <?php -//Deleting the temporary file +//Deleting the temporary file $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents_variation1.tmp"); diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt index fc2281dca0..af9ccbb714 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index ddc926180d..12bfd325ae 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -40,7 +40,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 510ec12aed..12d740c5f0 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -41,7 +41,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index f485b0ecf5..a302bf3e2f 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt index ecceb28093..f6f3c3a9c5 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -107,10 +107,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index 3afc3dc180..20ce0436e4 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt index df33059f30..417e5df5f4 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt index 25a122e1bc..e8baf08eeb 100644 --- a/ext/standard/tests/file/file_get_contents_variation6.phpt +++ b/ext/standard/tests/file/file_get_contents_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index cc8eb40f49..27ddea0060 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index d350b4b037..baad767d6f 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index 17c55b6135..0fb662b0a8 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index bb62eb47fb..4928404098 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -11,14 +11,14 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( /* Invalid args */ "-1" => -1, @@ -30,8 +30,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 5b325b0e98..97a3495d54 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -11,15 +11,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -30,7 +30,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 99812b5349..dccec9f105 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; diff --git a/ext/standard/tests/file/file_put_contents.phpt b/ext/standard/tests/file/file_put_contents.phpt index 4566c37567..1607ab1bde 100644 --- a/ext/standard/tests/file/file_put_contents.phpt +++ b/ext/standard/tests/file/file_put_contents.phpt @@ -21,7 +21,7 @@ var_dump(file_put_contents($file, "string", 0, $fp)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index 35d193095c..f9a2d0e7e2 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -28,7 +28,7 @@ echo filesize($filename)."\n"; readfile($filename); echo "\n"; unlink($filename); - + ?> ===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 753e287504..ae56486d5f 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_put_contents() function : usage variation - different data types to write +Test file_put_contents() function : usage variation - different data types to write --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index bf454ca08c..1506726dc4 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -106,10 +106,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index d919c4a08f..536079115f 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -5,15 +5,15 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); -$thisTestDir = basename(__FILE__, ".php") . ".dir"; +$thisTestDir = basename(__FILE__, ".php") . ".dir"; mkdir($thisTestDir); chdir($thisTestDir); @@ -35,7 +35,7 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists + //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, (binary) "File in include path", FILE_USE_INCLUDE_PATH); $line = file_get_contents($filename); diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt index baaa7a65d9..c59bd4695a 100644 --- a/ext/standard/tests/file/file_put_contents_variation5.phpt +++ b/ext/standard/tests/file/file_put_contents_variation5.phpt @@ -10,7 +10,7 @@ $thisTestDir = dirname(__FILE__) . '/' .basename(__FILE__, ".php") . ".directory mkdir($thisTestDir); chdir($thisTestDir); -$filename = basename(__FILE__, ".php") . ".tmp"; +$filename = basename(__FILE__, ".php") . ".tmp"; $scriptLocFile = dirname(__FILE__)."/".$filename; $newpath = "rubbish"; @@ -35,9 +35,9 @@ function runtest() { echo "Fail - this is PHP52 behaviour\n"; unlink($scriptLocFile); }else { - $line = file_get_contents($filename); + $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index aaea612b36..7ed97f33e1 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -37,14 +37,14 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists + //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, (binary) "File in include path", FILE_USE_INCLUDE_PATH); - file_put_contents($filename, (binary) ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); + file_put_contents($filename, (binary) ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index e1a94a2043..d4ee0585fd 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); @@ -73,7 +73,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index b1b2face60..94cfa627d3 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -33,14 +33,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; @@ -65,7 +65,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 92fe7b3d6a..095980b536 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -10,14 +10,14 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( "-1" => -1, "TRUE" => TRUE, @@ -28,8 +28,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); @@ -42,7 +42,7 @@ foreach($names_arr as $key =>$value) { unlink($value); } else { echo "Failed to write data to: $key\n"; - } + } }; ?> diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt Binary files differindex 3cd92c5ec8..20a2861bca 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 79a42fe9b1..64a5a67e33 100644 --- a/ext/standard/tests/file/file_put_contents_variation9.phpt +++ b/ext/standard/tests/file/file_put_contents_variation9.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -34,7 +34,7 @@ run_test($softlink); //can only create a hardlink if the file exists. file_put_contents($filename,""); -link($filename, $hardlink); +link($filename, $hardlink); run_test($hardlink); unlink($chainlink); diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 512d5f3eb6..1936d96559 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -2,7 +2,7 @@ Test file() function : usage variations --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array Returns the file in an array @@ -17,8 +17,8 @@ foreach( $data_array as $data ) { echo "--Iteration $count --\n"; $fh = fopen($file_path."/file_variation.tmp", "w"); fwrite($fh, (binary)$data); - var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); - var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); $count++; fclose($fh); } diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt index ab37ea5c45..9c3ad0e546 100644 --- a/ext/standard/tests/file/file_variation2.phpt +++ b/ext/standard/tests/file/file_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file() function : first parameter variation +Test file() function : first parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt index f61c3c257e..9001a84318 100644 --- a/ext/standard/tests/file/file_variation3.phpt +++ b/ext/standard/tests/file/file_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file() function : second parameter variation +Test file() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt index 04ddc91600..084fc9db56 100644 --- a/ext/standard/tests/file/file_variation4.phpt +++ b/ext/standard/tests/file/file_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file() function : third parameter variation +Test file() function : third parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file stream resource 'file stream resource' => $file_stream_resource, ); diff --git a/ext/standard/tests/file/file_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt index 1f15491118..b8badd0e42 100644 --- a/ext/standard/tests/file/file_variation5.phpt +++ b/ext/standard/tests/file/file_variation5.phpt @@ -25,7 +25,7 @@ var_dump(file("./$test_dirname/../$filename")); echo "\nfile() on a path containing .. with invalid directories\n"; var_dump(file("./$test_dirname/bad_dir/../../$filename")); - + echo "\nfile() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index ca3be36b56..6debeaac7e 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index be18fcb032..b4f1311ef0 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 9ddd1e6209..b95f9962e7 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -21,7 +21,7 @@ $contents = array( "File has\r\nmultiple crlfs\n\r\n" ); -@unlink($testfile); +@unlink($testfile); foreach ($contents as $content) { $h = fopen($testfile, "w"); fwrite($h, $content); diff --git a/ext/standard/tests/file/filegroup_basic.phpt b/ext/standard/tests/file/filegroup_basic.phpt index 36333b21ba..2c8216a0ad 100644 --- a/ext/standard/tests/file/filegroup_basic.phpt +++ b/ext/standard/tests/file/filegroup_basic.phpt @@ -12,7 +12,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -echo "*** Testing filegroup(): basic functionality ***\n"; +echo "*** Testing filegroup(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; diff --git a/ext/standard/tests/file/filegroup_variation1.phpt b/ext/standard/tests/file/filegroup_variation1.phpt index ee76477ac8..4b4a9aa00e 100644 --- a/ext/standard/tests/file/filegroup_variation1.phpt +++ b/ext/standard/tests/file/filegroup_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying filegroup() on links */ +/* Creating soft and hard links to a file and applying filegroup() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/filegroup_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt index afac40c9ab..966a9f43b7 100644 --- a/ext/standard/tests/file/filegroup_variation2.phpt +++ b/ext/standard/tests/file/filegroup_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( filegroup($filename) ); diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt index b275944f78..ebefeb7e3f 100644 --- a/ext/standard/tests/file/filegroup_variation3.phpt +++ b/ext/standard/tests/file/filegroup_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/filegroup_variation3//filegroup_variation3.tmp", "//filegroup_variation3//filegroup_variation3.tmp", "/filegroup_variation3/*.tmp", - "filegroup_variation3/filegroup*.tmp", + "filegroup_variation3/filegroup*.tmp", /* Testing Binary safe */ "/filegroup_variation3/filegroup_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileinode_basic.phpt b/ext/standard/tests/file/fileinode_basic.phpt index 98e5cf0836..c7fc77e7d5 100644 --- a/ext/standard/tests/file/fileinode_basic.phpt +++ b/ext/standard/tests/file/fileinode_basic.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt index eb5d79e0c3..892121cc96 100644 --- a/ext/standard/tests/file/fileinode_error.phpt +++ b/ext/standard/tests/file/fileinode_error.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 1fac953098..9504766d9d 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation1.phpt b/ext/standard/tests/file/fileinode_variation1.phpt index d251cc3f85..4961db19a6 100644 --- a/ext/standard/tests/file/fileinode_variation1.phpt +++ b/ext/standard/tests/file/fileinode_variation1.phpt @@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileinode() on links */ +/* Creating soft and hard links to a file and applying fileinode() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileinode_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt index e8e7af6a6e..447c189e04 100644 --- a/ext/standard/tests/file/fileinode_variation2.phpt +++ b/ext/standard/tests/file/fileinode_variation2.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - invalid filenames Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileinode($filename) ); diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt index ca84864b59..2f51e8f595 100644 --- a/ext/standard/tests/file/fileinode_variation3.phpt +++ b/ext/standard/tests/file/fileinode_variation3.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - diff. path notations Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -29,7 +29,7 @@ $files_arr = array( "/fileinode_variation3//fileinode_variation3.tmp", "//fileinode_variation3//fileinode_variation3.tmp", "/fileinode_variation3/*.tmp", - "fileinode_variation3/fileinode*.tmp", + "fileinode_variation3/fileinode*.tmp", /* Testing Binary safe */ "/fileinode_variation3/fileinode_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt index 5b5ff9a900..05e4c16ef8 100644 --- a/ext/standard/tests/file/fileowner_basic.phpt +++ b/ext/standard/tests/file/fileowner_basic.phpt @@ -7,7 +7,7 @@ Test fileowner() function: basic functionality * FALSE in case of an error. */ -echo "*** Testing fileowner(): basic functionality ***\n"; +echo "*** Testing fileowner(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; var_dump( fileowner(__FILE__) ); diff --git a/ext/standard/tests/file/fileowner_variation1.phpt b/ext/standard/tests/file/fileowner_variation1.phpt index b70ac366d2..e40175d1bd 100644 --- a/ext/standard/tests/file/fileowner_variation1.phpt +++ b/ext/standard/tests/file/fileowner_variation1.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileowner() on links */ +/* Creating soft and hard links to a file and applying fileowner() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileowner_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt index feff767879..83eeb6d5c0 100644 --- a/ext/standard/tests/file/fileowner_variation2.phpt +++ b/ext/standard/tests/file/fileowner_variation2.phpt @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileowner($filename) ); diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt index 6f91c31d11..5768f528f1 100644 --- a/ext/standard/tests/file/fileowner_variation3.phpt +++ b/ext/standard/tests/file/fileowner_variation3.phpt @@ -29,7 +29,7 @@ $files_arr = array( "/fileowner_variation3//fileowner_variation3.tmp", "//fileowner_variation3//fileowner_variation3.tmp", "/fileowner_variation3/*.tmp", - "fileowner_variation3/fileowner*.tmp", + "fileowner_variation3/fileowner*.tmp", /* Testing Binary safe */ "/fileowner_variation3/fileowner_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileperms_variation1.phpt b/ext/standard/tests/file/fileperms_variation1.phpt index e90cf8784f..fdcedcac59 100644 --- a/ext/standard/tests/file/fileperms_variation1.phpt +++ b/ext/standard/tests/file/fileperms_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileperms() on links */ +/* Creating soft and hard links to a file and applying fileperms() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileperms_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt index 47c0c6593a..f9b190bcf8 100644 --- a/ext/standard/tests/file/fileperms_variation2.phpt +++ b/ext/standard/tests/file/fileperms_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileperms($filename) ); diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt index 575fe11a2f..6ae97d1601 100644 --- a/ext/standard/tests/file/fileperms_variation3.phpt +++ b/ext/standard/tests/file/fileperms_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/fileperms_variation3//fileperms_variation3.tmp", "//fileperms_variation3//fileperms_variation3.tmp", "/fileperms_variation3/*.tmp", - "fileperms_variation3/fileperms*.tmp", + "fileperms_variation3/fileperms*.tmp", /* Testing Binary safe */ "/fileperms_variation3/fileperms_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt index 58041b95c3..5a11259b6b 100644 --- a/ext/standard/tests/file/filesize_basic.phpt +++ b/ext/standard/tests/file/filesize_basic.phpt @@ -2,14 +2,14 @@ Test filesize() function: basic functionaity --FILE-- <?php -/* +/* * Prototype: int filesize ( string $filename ); - * Description: Returns the size of the file in bytes, or FALSE + * Description: Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing size of files and directories with filesize() ***\n"; +echo "*** Testing size of files and directories with filesize() ***\n"; $file_path = dirname(__FILE__); @@ -30,7 +30,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/filesize_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECTF-- *** Testing size of files and directories with filesize() *** int(%d) int(%d) diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 6d8cfa8693..0060e66f55 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -2,9 +2,9 @@ Test filesize() function: error conditions --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ @@ -23,7 +23,7 @@ echo "\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): error conditions *** Warning: filesize(): stat failed for /no/such/file in %s on line %d bool(false) diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 14975feb49..66e193c201 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index e9ff053361..18aeaddafd 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation1.phpt b/ext/standard/tests/file/filesize_variation1.phpt index 0a490cd7e6..d8d3aff27a 100644 --- a/ext/standard/tests/file/filesize_variation1.phpt +++ b/ext/standard/tests/file/filesize_variation1.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 544e3aa408..71577d8301 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation", 2); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation2.phpt b/ext/standard/tests/file/filesize_variation2.phpt index 8a7594ee79..0379451660 100644 --- a/ext/standard/tests/file/filesize_variation2.phpt +++ b/ext/standard/tests/file/filesize_variation2.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt index ab38c7d1c3..685f2e475f 100644 --- a/ext/standard/tests/file/filesize_variation3-win32.phpt +++ b/ext/standard/tests/file/filesize_variation3-win32.phpt @@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, (binary)str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation3.phpt b/ext/standard/tests/file/filesize_variation3.phpt index 67d46998d2..604887d116 100644 --- a/ext/standard/tests/file/filesize_variation3.phpt +++ b/ext/standard/tests/file/filesize_variation3.phpt @@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 5f20f4210d..08e141707e 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 29f85fc243..0770f1d2ba 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -7,9 +7,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ @@ -17,7 +17,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; diff --git a/ext/standard/tests/file/filesize_variation5.phpt b/ext/standard/tests/file/filesize_variation5.phpt index 638f8ba8ed..9d1338481d 100644 --- a/ext/standard/tests/file/filesize_variation5.phpt +++ b/ext/standard/tests/file/filesize_variation5.phpt @@ -4,13 +4,13 @@ Test filesize() function: usage variations - size of files Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; /* null, false, "", " " */ var_dump( filesize(NULL) ); @@ -20,7 +20,7 @@ var_dump( filesize(' ') ); var_dump( filesize('|') ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt index d02f9f2a10..f6031219c7 100644 --- a/ext/standard/tests/file/filestat.phpt +++ b/ext/standard/tests/file/filestat.phpt @@ -29,7 +29,7 @@ var_dump(filectime("/no/such/file/or/dir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index 4a6d3b2bc2..b8ff92f18a 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -5,7 +5,7 @@ Test filetype() function: Basic functionality /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with files and dirs ***\n"; diff --git a/ext/standard/tests/file/filetype_error.phpt b/ext/standard/tests/file/filetype_error.phpt index b965272011..b49a5286c6 100644 --- a/ext/standard/tests/file/filetype_error.phpt +++ b/ext/standard/tests/file/filetype_error.phpt @@ -5,7 +5,7 @@ Test filetype() function: Error conditions /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing error conditions ***"; diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 3308cee20d..4a96b71e1c 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -14,7 +14,7 @@ if (!function_exists("posix_mkfifo")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with various types ***\n"; diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 125b48c02c..df86f67763 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -9,14 +9,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } if (!file_exists("/dev/null")) { die('skip /dev/null not available'); -} +} ?> --FILE-- <?php /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "-- Checking for char --\n"; diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index 9a1a68f784..e02cafced8 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -16,7 +16,7 @@ if (!file_exists("/dev/ram0")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "-- Checking for block --\n"; diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt index ab08de5256..2330270113 100644 --- a/ext/standard/tests/file/flock.phpt +++ b/ext/standard/tests/file/flock.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- Warning: flock() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index d218cee5ef..99b1ba1c59 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -2,13 +2,13 @@ Test flock() function: Basic functionality --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with file and dir ***\n"; +echo "*** Testing flock() fun with file and dir ***\n"; $file_path = dirname(__FILE__); $file_handle = fopen("$file_path/lock.tmp", "w"); @@ -30,7 +30,7 @@ rmdir("$file_path/dir"); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 81e42f3fe6..afb68b5337 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -2,9 +2,9 @@ Test flock() function: Error conditions --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ @@ -23,7 +23,7 @@ $operations = array( array(), "string", "", - "\0" + "\0" ); $i = 0; @@ -55,7 +55,7 @@ echo "\n*** Done ***\n"; $file = dirname(__FILE__)."/flock.tmp"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** --- Iteration 0 --- diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index af67ab402a..ff0a4bbe61 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -2,9 +2,9 @@ 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 +Description: PHP supports a portable way of locking complete files in an advisory way */ @@ -21,7 +21,7 @@ $operations = array( LOCK_EX|LOCK_NB, LOCK_SH|LOCK_EX, LOCK_UN, - 1, + 1, 2, 2.234, TRUE @@ -64,7 +64,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt index 5277874ba6..61ddb2e09c 100644 --- a/ext/standard/tests/file/fnmatch_error.phpt +++ b/ext/standard/tests/file/fnmatch_error.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing error conditions for fnmatch() ***"; diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index 6d28528c1c..b3607be58b 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing fnmatch() with file and various patterns ***\n"; @@ -43,7 +43,7 @@ $pattern_arr = array( 17 => "?match?", 18 => "match.tmp", 19 => "/match.tmp", -20 => "/match.tmp/", +20 => "/match.tmp/", 21 => 'match.tmp', 22 => 'match.tmp\0', 23 => "match.tmp\0", diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index c949f86fa2..bbae6f839a 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -15,9 +15,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -30,18 +30,18 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', - 'c:'.$rootdir, - 'c:adir', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', + 'c:'.$rootdir, + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation10.tmp"; diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 61a2f60ecf..28db5ca780 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -14,9 +14,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -29,18 +29,18 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', - 'c:'.$rootdir, - 'c:adir', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', + 'c:'.$rootdir, + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation11.tmp"; diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 9df4490236..a0cbe28089 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ set_include_path("rubbish"); @@ -16,12 +16,12 @@ restore_include_path(); function testme() { - $tmpfile = basename(__FILE__, ".php") . ".tmp"; + $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); fwrite($h, (binary) "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -31,9 +31,9 @@ function testme() { fclose($h); unlink($tmpfile); } - - $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; + + $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; $h = @fopen($scriptDirFile, "r"); if ($h === false) { echo "Not created in script dir\n"; @@ -41,7 +41,7 @@ function testme() { else { echo "created in script dir\n"; fclose($h); - unlink($scriptDirFile); + unlink($scriptDirFile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index d540d70006..76cf084029 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -28,13 +28,13 @@ function runtest() { $tempDir = 'fopen_variation13.dir.tmp'; $tmpfile = 'fopen_variation13.tmp'; $absFile = getcwd().'/'.$tempDir.'/'.$tmpfile; - + mkdir($tempDir); $h = fopen($absFile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = fopen($absFile, "r"); if ($h === false) { echo "Not created absolute location\n"; @@ -45,7 +45,7 @@ function runtest() { } unlink($absFile); rmdir($tempDir); - + } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 554d8c6ded..8c4c23fb30 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -53,15 +53,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -73,14 +73,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index aa4e05b892..b62bedfe68 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -45,15 +45,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -65,14 +65,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 8599306eda..0dd3d23857 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -57,15 +57,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -77,14 +77,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 24b01fbe8c..3dca66841f 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -49,15 +49,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -69,14 +69,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index e14f2e1c16..a380a2a40d 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,18 +31,18 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir16"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir.'/fopen_variation16.tmp'; $h = fopen($tmpfile, "w+", true); fwrite($h, (binary) "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -60,10 +60,10 @@ function runtest() { echo "found file - not in dir1\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 8abae0fbe5..a8be3be4dd 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -1,13 +1,13 @@ --TEST-- -Test fopen() function : variation: use include path create and read a file (relative) +Test fopen() function : variation: use include path create and read a file (relative) --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,17 +31,17 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir17"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir . '/' . basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w+", true); fwrite($h, (binary) "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -59,10 +59,10 @@ function runtest() { echo "found file for reading\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index 031ba45734..069ce11170 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ $tmpDir = 'fopenVar19.Dir'; diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt index 3467a3a606..7430471623 100644 --- a/ext/standard/tests/file/fopen_variation3.phpt +++ b/ext/standard/tests/file/fopen_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt index 38f5fefe62..c6bc089912 100644 --- a/ext/standard/tests/file/fopen_variation4.phpt +++ b/ext/standard/tests/file/fopen_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; @@ -103,7 +103,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //file resource 'file resource' => $fileresource ); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 975560f5ce..142259d045 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -60,7 +60,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, (binary) "in dir2"); @@ -77,44 +77,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, (binary) "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, (binary) "in working dir"); fclose($h); - + //should still read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, (binary) "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 3a99212afe..7bfb7c0ef5 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test fopen() function : variation: use include path and stream context relative/absolute file +Test fopen() function : variation: use include path and stream context relative/absolute file --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 13f075cfff..d0026f1da4 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, (binary)"This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink($dir1.'/'.$tmpfile); + unlink($dir1.'/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index dd95014ff3..18c9393d44 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -59,7 +59,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, (binary) "in dir2"); @@ -76,44 +76,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, (binary) "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, (binary) "in working dir"); fclose($h); - + //should read the dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the working dir file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, (binary) "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index 4b0a7270db..b5730b4756 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, (binary) "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen('dir1/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink('dir1/'.$tmpfile); + unlink('dir1/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt index cd6bed89cf..79922e31e1 100644 --- a/ext/standard/tests/file/fopencookie.phpt +++ b/ext/standard/tests/file/fopencookie.phpt @@ -20,12 +20,12 @@ fopencookie detected and working (or cast mechanism works) class userstream { public $position = 0; public $data = "If you can read this, it worked"; - + function stream_open($path, $mode, $options, &$opened_path) { return true; } - + function stream_read($count) { $ret = substr($this->data, $this->position, $count); diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8924b27dd2..8555f3782a 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt index 958397b0e5..64d24d60b5 100644 --- a/ext/standard/tests/file/fpassthru_error.phpt +++ b/ext/standard/tests/file/fpassthru_error.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index 749eefb4c8..f27f959074 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Variations --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. @@ -22,7 +22,7 @@ $file_read = fopen($file_name, "r"); $offset_arr = array( /* Positive offsets */ 0, - 1, + 1, 5, 10, 20, @@ -30,10 +30,10 @@ $offset_arr = array( 35, 36, 70, - /* Negative offsets, the file pointer should be at the end of file + /* Negative offsets, the file pointer should be at the end of file to get data */ - -1, - -5, + -1, + -5, -10, -20, -35, @@ -48,12 +48,12 @@ for( $i=0; $i<count($offset_arr); $i++ ) { var_dump(fpassthru($file_read) ); rewind( $file_read ); }else - { + { fseek($file_read, $offset_arr[$i], SEEK_END); var_dump( fpassthru($file_read) ); rewind( $file_read ); - } -} + } +} fclose($file_read); // closing the handle diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt index f952cdbc8c..9af128298a 100644 --- a/ext/standard/tests/file/fpassthru_variation1.phpt +++ b/ext/standard/tests/file/fpassthru_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fpassthru(resource fp) - * Description: Output all remaining data from a file pointer + * Description: Output all remaining data from a file pointer * Source code: ext/standard/file.c * Alias to functions: gzpassthru */ diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt index 1e6ba94edd..ca958da3d7 100644 --- a/ext/standard/tests/file/fputcsv_error.phpt +++ b/ext/standard/tests/file/fputcsv_error.phpt @@ -5,7 +5,7 @@ Test fputcsv() function : error conditions /* Prototype: int fputcsv ( resource $handle [, array $fields [, string $delimiter [, string $enclosure]]] ); Description:fputcsv() formats a line (passed as a fields array) as CSV and write it to the specified file - handle. Returns the length of the written string, or FALSE on failure. + handle. Returns the length of the written string, or FALSE on failure. */ echo "*** Testing error conditions ***\n"; diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt index 68df33c8ec..bad44ea0c3 100644 --- a/ext/standard/tests/file/fputcsv_variation1.phpt +++ b/ext/standard/tests/file/fputcsv_variation1.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when all its parameters are provided */ echo "*** Testing fputcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation1.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt index 21d845ffa7..69fcadbfb6 100644 --- a/ext/standard/tests/file/fputcsv_variation10.phpt +++ b/ext/standard/tests/file/fputcsv_variation10.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with line without any csv fields +Test fputcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with line without any csv fields echo "*** Testing fputcsv() : with no CSV format in the field ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -28,13 +28,13 @@ $filename = "$file_path/fputcsv_variation10.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($fields as $field) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -46,22 +46,22 @@ foreach ($fields as $field) { exit(); } $csv_field = $field; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); - + // check the file pointer position and eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt index 770b89b711..83e80adba2 100644 --- a/ext/standard/tests/file/fputcsv_variation11.phpt +++ b/ext/standard/tests/file/fputcsv_variation11.phpt @@ -1,18 +1,18 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure value +Test fputcsv() : usage variations - with default enclosure value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value is provided */ echo "*** Testing fputcsv() : with default enclosure value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation11.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt index 24fe5c4658..f177965686 100644 --- a/ext/standard/tests/file/fputcsv_variation12.phpt +++ b/ext/standard/tests/file/fputcsv_variation12.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure and different delimiter +Test fputcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter value @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure and different delimit echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation12.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+') ); // check the file pointer position and eof @@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt index a8a350b222..0518cb7435 100644 --- a/ext/standard/tests/file/fputcsv_variation13.phpt +++ b/ext/standard/tests/file/fputcsv_variation13.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure & delimiter of two chars +Test fputcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation13.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++') ); // check the file pointer position and eof @@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 36a4975c12..2cbbf517ed 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -2,9 +2,9 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read only modes) --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -51,8 +51,8 @@ foreach ($csv_lists as $csv_list) { exit(); } fclose($file_handle); - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); if ( !$file_handle ) { @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%') ); // check the file pointer position and eof @@ -70,13 +70,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt index 3ec4e91f2a..5cbaed0fdd 100644 --- a/ext/standard/tests/file/fputcsv_variation2.phpt +++ b/ext/standard/tests/file/fputcsv_variation2.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter is NULL */ echo "*** Testing fputcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation2.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, $enclosure) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt index 14a2503eca..f184ffabf2 100644 --- a/ext/standard/tests/file/fputcsv_variation3.phpt +++ b/ext/standard/tests/file/fputcsv_variation3.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when enclosure is NULL */ echo "*** Testing fputcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation3.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, NULL) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt index bc374ad397..02c7485d7e 100644 --- a/ext/standard/tests/file/fputcsv_variation4.phpt +++ b/ext/standard/tests/file/fputcsv_variation4.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with delimiter and enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter and enclosure is NULL */ echo "*** Testing fputcsv() : with delimiter and enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation4.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, NULL) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt index 9d78854d71..49f6d81d10 100644 --- a/ext/standard/tests/file/fputcsv_variation5.phpt +++ b/ext/standard/tests/file/fputcsv_variation5.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default arguments values are considered */ echo "*** Testing fputcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation5.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt index f30ce24f40..5de601707c 100644 --- a/ext/standard/tests/file/fputcsv_variation6.phpt +++ b/ext/standard/tests/file/fputcsv_variation6.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and enclosure +Test fputcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation6.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', '%') ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt index 8329251d73..789825de52 100644 --- a/ext/standard/tests/file/fputcsv_variation7.phpt +++ b/ext/standard/tests/file/fputcsv_variation7.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and same enclosure +Test fputcsv() : usage variations - with different delimiter and same enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation7.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure) ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt index 096f37908a..74c10852d8 100644 --- a/ext/standard/tests/file/fputcsv_variation8.phpt +++ b/ext/standard/tests/file/fputcsv_variation8.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with same delimiter and different enclosure +Test fputcsv() : usage variations - with same delimiter and different enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation8.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+') ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt index 386d7bd1e7..c4c560971a 100644 --- a/ext/standard/tests/file/fputcsv_variation9.phpt +++ b/ext/standard/tests/file/fputcsv_variation9.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - two chars as enclosure & delimiter +Test fputcsv() : usage variations - two chars as enclosure & delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - two chars as enclosure & delimiter echo "*** Testing fputcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation9.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%' ) ); @@ -63,13 +63,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index 44e534241c..c88491f17c 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -4,19 +4,19 @@ Test fread() function : basic functionality <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ // include the file.inc for common functions for test include ("file.inc"); -/* Function : function check_size(string $data, int $expect_size) +/* Function : function check_size(string $data, int $expect_size) Description : Check the length of the data, and compare the size with $expect_size $data : Text data. - $expect_size : Expected data length + $expect_size : Expected data length */ function check_size($data, $expect_size) { @@ -29,36 +29,36 @@ function check_size($data, $expect_size) { echo "*** Testing fread() basic operations ***\n"; -/* +/* test fread with file opened in "r" and "rb" mode only - Content with numeric and strings with it + Content with numeric and strings with it */ $file_modes = array( "r", "rb", "rt", "r+", "r+b", "r+t"); $file_content_types = array("numeric","text","text_with_new_line","alphanumeric"); foreach($file_content_types as $file_content_type) { echo "\n-- Testing fread) with file having data of type ". $file_content_type ." --\n"; - /* create files with $file_content_type */ + /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_basic"); $filename = dirname(__FILE__)."/fread_basic1.tmp"; // this is name of the file created by create_files() - + /* open the file using $files_modes and perform fread() on it */ - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { - + echo "-- File opened in mode ".$file_modes[$inner_loop_counter]." --\n"; $file_handle = fopen($filename, $file_modes[$inner_loop_counter]); if (!$file_handle) { echo "Error: failed to fopen() file: $filename!"; exit(); } - - /* read file by giving the acutal length, check the length and content by calculating the - hash using md5() function + + /* read file by giving the acutal length, check the length and content by calculating the + hash using md5() function */ /* Reading 1024 bytes from file, expecting 1024 bytes */ ; - + var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); echo "Reading 1024 bytes from file, expecting 1024 bytes ... "; @@ -68,7 +68,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump( feof($file_handle) ); var_dump( md5($data_from_file) ); // calculate the hash and dump it - /* read file by giving size more than its size */ + /* read file by giving size more than its size */ var_dump(rewind($file_handle)); var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); @@ -94,7 +94,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump(fclose($file_handle)); // now close the file } // end of inner for loop - // delete the file created + // delete the file created delete_file($filename); // delete file with name } // end of outer foreach loop echo "Done\n"; diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt index 4917d2ef47..5fbb9bef29 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -4,14 +4,14 @@ Test fread() function : error conditions <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ echo "*** Testing error conditions ***\n"; -$filename = __FILE__; +$filename = __FILE__; $file_handle = fopen($filename, "r"); // zero argument @@ -22,9 +22,9 @@ var_dump( fread() ); echo "-- Testing fread() with more than expected number of arguments --\n"; var_dump( fread($file_handle, 10, $file_handle) ); -// invalid length argument +// invalid length argument echo "-- Testing fread() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fread($file_handle, $len) ); $len = -10; var_dump( fread($file_handle, $len) ); diff --git a/ext/standard/tests/file/fread_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt index 0f5c4ed763..d930e55a71 100644 --- a/ext/standard/tests/file/fread_fwrite_basic.phpt +++ b/ext/standard/tests/file/fread_fwrite_basic.phpt @@ -5,16 +5,16 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * proto int fwrite(resource fp, string str [, int length]) * Function is implemented in ext/standard/file.c - */ - + */ + /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index c46dbe2a3c..dbc786758b 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, read/write modes <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -18,8 +18,8 @@ Test fread() function : usage variations - read some/all chars, read/write modes include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -47,7 +47,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -65,7 +65,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation"); } - + $filename = dirname(__FILE__)."/fread_variation1.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 23813a6672..1dc87c537c 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, write only mode <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -16,8 +16,8 @@ Test fread() function : usage variations - read some/all chars, write only mode include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -27,7 +27,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -46,7 +46,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index a39842ce5b..7afa2cae31 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "私はガラスを食べられますfread_variation", 3); } - + $filename = dirname(__FILE__)."/私はガラスを食べられますfread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index 5491555d1f..2d2518a1c1 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 949e7b8869..80a6caa626 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 77d733a50e..288dcfc66c 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index fdff8de704..d3f3356b17 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt index 700439fcb5..6d3d0a5b96 100644 --- a/ext/standard/tests/file/fscanf.phpt +++ b/ext/standard/tests/file/fscanf.phpt @@ -63,7 +63,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fscanf.dat"; unlink($filename); ?> ---EXPECTF-- +--EXPECTF-- Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index f93d1b2a57..520e743e6a 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -13,7 +13,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_error.tmp"; $file_handle = fopen($filename, 'w'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); fwrite($file_handle, "hello world"); fclose($file_handle); @@ -23,7 +23,7 @@ var_dump( fscanf() ); // single argument $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle) ); fclose($file_handle); @@ -33,7 +33,7 @@ var_dump( fscanf($file_handle, "%s") ); // number of formats in format strings not matching the no of variables $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) ); fclose($file_handle); @@ -47,10 +47,10 @@ $invalid_formats = array( $undefined_var, undefined_constant, // looping to use various invalid formats with fscanf() foreach($invalid_formats as $format) { $file_handle = fopen($filename, 'r'); - if ($file_handle == false) + if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, $format) ); - fclose($file_handle); + fclose($file_handle); } echo "\n*** Done ***"; diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index b0c41e5f84..57b2918b1e 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -23,7 +23,7 @@ if($file_handle == false) @fwrite($file_handle, 12345); fclose($file_handle); -// open file for reading +// open file for reading $file_handle = fopen($filename, "r"); // capturing the return value from fscanf() called without third argument $return_value = fscanf($file_handle, "%s"); @@ -36,7 +36,7 @@ echo "\n*** Done ***"; <?php $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; -unlink($filename); +unlink($filename); ?> --EXPECTF-- *** Testing fscanf(): for its return type without third argument *** diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index a46c112879..9ab441610c 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with resource +Test fscanf() function: usage variations - float formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with resource ***\n"; +echo "*** Test fscanf(): different float format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation10.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt index 27de2ae5df..7b5168011f 100644 --- a/ext/standard/tests/file/fscanf_variation11.phpt +++ b/ext/standard/tests/file/fscanf_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with arrays +Test fscanf() function: usage variations - float formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with arrays ***\n"; +echo "*** Test fscanf(): different float format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation11.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation12.phpt b/ext/standard/tests/file/fscanf_variation12.phpt index 33bfb67db0..8968fc3397 100644 --- a/ext/standard/tests/file/fscanf_variation12.phpt +++ b/ext/standard/tests/file/fscanf_variation12.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with strings ***\n"; +echo "*** Test fscanf(): different float format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation12.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt index 49525b484c..89da5567f4 100644 --- a/ext/standard/tests/file/fscanf_variation13.phpt +++ b/ext/standard/tests/file/fscanf_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with boolean +Test fscanf() function: usage variations - float formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with boolean data ***\n"; +echo "*** Test fscanf(): different float format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation13.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt index 2b497c9f5b..a49e8391df 100644 --- a/ext/standard/tests/file/fscanf_variation14.phpt +++ b/ext/standard/tests/file/fscanf_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with strings +Test fscanf() function: usage variations - string formats with strings --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with different string ***\n"; +echo "*** Test fscanf(): different string format types with different string ***\n"; // create a file $filename = "$file_path/fscanf_variation14.tmp"; @@ -65,7 +65,7 @@ $valid_strings = array( ); // various string formats -$string_formats = array( "%s", +$string_formats = array( "%s", "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", diff --git a/ext/standard/tests/file/fscanf_variation15.phpt b/ext/standard/tests/file/fscanf_variation15.phpt index 76422dbc8c..a6dc720b91 100644 --- a/ext/standard/tests/file/fscanf_variation15.phpt +++ b/ext/standard/tests/file/fscanf_variation15.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with float values ***\n"; +echo "*** Test fscanf(): different string format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation15.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt index 8025767bc1..df4ebaa476 100644 --- a/ext/standard/tests/file/fscanf_variation16.phpt +++ b/ext/standard/tests/file/fscanf_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with resource +Test fscanf() function: usage variations - string formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with resource ***\n"; +echo "*** Test fscanf(): different string format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation16.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt index 2db8871c2b..899d558057 100644 --- a/ext/standard/tests/file/fscanf_variation17.phpt +++ b/ext/standard/tests/file/fscanf_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with arrays +Test fscanf() function: usage variations - string formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with arrays ***\n"; +echo "*** Test fscanf(): different string format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation17.tmp"; @@ -37,7 +37,7 @@ $array_types = array ( ); $string_formats = array( "%s", - "%hs", "%ls", "%Ls", + "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s"); diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index e80606a3fc..5babc5479f 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with integer values ***\n"; +echo "*** Test fscanf(): different string format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation18.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt index 08edc522b4..0cf07076fe 100644 --- a/ext/standard/tests/file/fscanf_variation19.phpt +++ b/ext/standard/tests/file/fscanf_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with boolean +Test fscanf() function: usage variations - string formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with boolean data ***\n"; +echo "*** Test fscanf(): different string format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation19.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index 55978b95e6..b500152460 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with integer values +Test fscanf() function: usage variations - integer formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with different integer values ***\n"; +echo "*** Test fscanf(): different integer format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation2.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index cb34edd23c..d8a28334f3 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with integer values +Test fscanf() function: usage variations - char formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with different integer values ***\n"; +echo "*** Test fscanf(): different char format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation20.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation21.phpt b/ext/standard/tests/file/fscanf_variation21.phpt index 51381ce479..42e05aaf04 100644 --- a/ext/standard/tests/file/fscanf_variation21.phpt +++ b/ext/standard/tests/file/fscanf_variation21.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with float values ***\n"; +echo "*** Test fscanf(): different char format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation21.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt index a3809500a6..50bb9e0d1d 100644 --- a/ext/standard/tests/file/fscanf_variation22.phpt +++ b/ext/standard/tests/file/fscanf_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with resource +Test fscanf() function: usage variations - char formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with resource ***\n"; +echo "*** Test fscanf(): different char format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation22.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$char_formats = array( "%c", +$char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", "\t%c", "\n%c", "%4c", diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt index d536c28fde..d429377e70 100644 --- a/ext/standard/tests/file/fscanf_variation23.phpt +++ b/ext/standard/tests/file/fscanf_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with arrays +Test fscanf() function: usage variations - char formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with arrays ***\n"; +echo "*** Test fscanf(): different char format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation23.tmp"; @@ -39,7 +39,7 @@ $array_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt index ddca007ccf..8be8354023 100644 --- a/ext/standard/tests/file/fscanf_variation24.phpt +++ b/ext/standard/tests/file/fscanf_variation24.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with strings ***\n"; +echo "*** Test fscanf(): different char format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation24.tmp"; @@ -43,9 +43,9 @@ $strings = array ( ); $char_formats = array( "%c", - "%hc", "%lc", "%Lc", + "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt index d874aba45e..c8391d8388 100644 --- a/ext/standard/tests/file/fscanf_variation25.phpt +++ b/ext/standard/tests/file/fscanf_variation25.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with boolean +Test fscanf() function: usage variations - char formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with boolean data ***\n"; +echo "*** Test fscanf(): different char format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation25.tmp"; @@ -31,7 +31,7 @@ $bool_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt index 1a883f479b..788427188c 100644 --- a/ext/standard/tests/file/fscanf_variation26.phpt +++ b/ext/standard/tests/file/fscanf_variation26.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with chars +Test fscanf() function: usage variations - char formats with chars --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with chars $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with chars ***\n"; +echo "*** Test fscanf(): different char format types with chars ***\n"; // create a file $filename = "$file_path/fscanf_variation26.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 137471e248..8982b73e2d 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with integer values +Test fscanf() function: usage variations - octal formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with different integer values ***\n"; +echo "*** Test fscanf(): different octal format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation27.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation28.phpt b/ext/standard/tests/file/fscanf_variation28.phpt index 97f72089fe..c96377b027 100644 --- a/ext/standard/tests/file/fscanf_variation28.phpt +++ b/ext/standard/tests/file/fscanf_variation28.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with float values ***\n"; +echo "*** Test fscanf(): different octal format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation28.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int @@ -41,7 +41,7 @@ $float_values = array ( ); $octal_formats = array( "%o", - "%ho", "%lo", "%Lo", + "%ho", "%lo", "%Lo", " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt index ce7083bc08..80b52654db 100644 --- a/ext/standard/tests/file/fscanf_variation29.phpt +++ b/ext/standard/tests/file/fscanf_variation29.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with resource +Test fscanf() function: usage variations - octal formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with resource ***\n"; +echo "*** Test fscanf(): different octal format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation29.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, @@ -33,7 +33,7 @@ $resource_types = array ( $octal_formats = array( "%o", "%ho", "%lo", "%Lo", - " %o", "%o ", "% o", + " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt index 8faff9d091..8ea8c8674a 100644 --- a/ext/standard/tests/file/fscanf_variation3.phpt +++ b/ext/standard/tests/file/fscanf_variation3.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with float values ***\n"; +echo "*** Test fscanf(): different integer format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation3.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt index b4cb350ed6..7303454175 100644 --- a/ext/standard/tests/file/fscanf_variation30.phpt +++ b/ext/standard/tests/file/fscanf_variation30.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with arrays +Test fscanf() function: usage variations - octal formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with arrays ***\n"; +echo "*** Test fscanf(): different octal format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation30.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation31.phpt b/ext/standard/tests/file/fscanf_variation31.phpt index f6bc7465f5..6ba47b6a51 100644 --- a/ext/standard/tests/file/fscanf_variation31.phpt +++ b/ext/standard/tests/file/fscanf_variation31.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with strings ***\n"; +echo "*** Test fscanf(): different octal format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation31.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt index 52e45405d0..b1f0b248b5 100644 --- a/ext/standard/tests/file/fscanf_variation32.phpt +++ b/ext/standard/tests/file/fscanf_variation32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with boolean +Test fscanf() function: usage variations - octal formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with boolean data ***\n"; +echo "*** Test fscanf(): different octal format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation32.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index b36598c72c..a01f5e761a 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with integer values +Test fscanf() function: usage variations - hexa formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; +echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation33.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt index 2acdc8ba1b..77437efc99 100644 --- a/ext/standard/tests/file/fscanf_variation34.phpt +++ b/ext/standard/tests/file/fscanf_variation34.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with float values ***\n"; +echo "*** Test fscanf(): different hexa format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation34.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt index 1f98bd8f42..0e98f95022 100644 --- a/ext/standard/tests/file/fscanf_variation35.phpt +++ b/ext/standard/tests/file/fscanf_variation35.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with resource +Test fscanf() function: usage variations - hexa formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with resource ***\n"; +echo "*** Test fscanf(): different hexa format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation35.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt index 44ff29536e..3bf065fde0 100644 --- a/ext/standard/tests/file/fscanf_variation36.phpt +++ b/ext/standard/tests/file/fscanf_variation36.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with arrays +Test fscanf() function: usage variations - hexa formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with arrays ***\n"; +echo "*** Test fscanf(): different hexa format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation36.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation37.phpt b/ext/standard/tests/file/fscanf_variation37.phpt index 7ab302dd39..43668fff4f 100644 --- a/ext/standard/tests/file/fscanf_variation37.phpt +++ b/ext/standard/tests/file/fscanf_variation37.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with strings ***\n"; +echo "*** Test fscanf(): different hexa format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation37.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt index 32a7f77b42..58327b867e 100644 --- a/ext/standard/tests/file/fscanf_variation38.phpt +++ b/ext/standard/tests/file/fscanf_variation38.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with boolean +Test fscanf() function: usage variations - hexa formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; +echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation38.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 1ed250c36c..42a8c515d8 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned int formats with integer values +Test fscanf() function: usage variations - unsigned int formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; +echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation39.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt index 0d9cd9dd43..b1ceb085f3 100644 --- a/ext/standard/tests/file/fscanf_variation4.phpt +++ b/ext/standard/tests/file/fscanf_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with resource +Test fscanf() function: usage variations - integer formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with resource ***\n"; +echo "*** Test fscanf(): different integer format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation4.tmp"; @@ -25,7 +25,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt index f3a0c96a71..1324007561 100644 --- a/ext/standard/tests/file/fscanf_variation40.phpt +++ b/ext/standard/tests/file/fscanf_variation40.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with float values ***\n"; +echo "*** Test fscanf(): different unsigned format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation40.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt index 080ce98054..507eac335c 100644 --- a/ext/standard/tests/file/fscanf_variation41.phpt +++ b/ext/standard/tests/file/fscanf_variation41.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with resource +Test fscanf() function: usage variations - unsigned formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with resource ***\n"; +echo "*** Test fscanf(): different unsigned format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation41.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt index 978187c733..fc8f8b89ca 100644 --- a/ext/standard/tests/file/fscanf_variation42.phpt +++ b/ext/standard/tests/file/fscanf_variation42.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with arrays +Test fscanf() function: usage variations - unsigned formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; +echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation42.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation43.phpt b/ext/standard/tests/file/fscanf_variation43.phpt index 8a0052f122..e77ea08cfc 100644 --- a/ext/standard/tests/file/fscanf_variation43.phpt +++ b/ext/standard/tests/file/fscanf_variation43.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with strings ***\n"; +echo "*** Test fscanf(): different unsigned format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation43.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt index 0b30b61f20..fa51b5bca4 100644 --- a/ext/standard/tests/file/fscanf_variation44.phpt +++ b/ext/standard/tests/file/fscanf_variation44.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with boolean +Test fscanf() function: usage variations - unsigned formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; +echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation44.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 9186e62f8e..7795dd6cf4 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with integer values +Test fscanf() function: usage variations - scientific formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with integer value $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; +echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation45.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation46.phpt b/ext/standard/tests/file/fscanf_variation46.phpt index 7145c8637a..c3cd8e0b7b 100644 --- a/ext/standard/tests/file/fscanf_variation46.phpt +++ b/ext/standard/tests/file/fscanf_variation46.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with float values ***\n"; +echo "*** Test fscanf(): different scientific format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation46.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt index 7010571a42..cf30d4b9c2 100644 --- a/ext/standard/tests/file/fscanf_variation47.phpt +++ b/ext/standard/tests/file/fscanf_variation47.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with resource +Test fscanf() function: usage variations - scientific formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with resource ***\n"; +echo "*** Test fscanf(): different scientific format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation47.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation48.phpt b/ext/standard/tests/file/fscanf_variation48.phpt index 5b61e5b71e..b2412fa9b8 100644 --- a/ext/standard/tests/file/fscanf_variation48.phpt +++ b/ext/standard/tests/file/fscanf_variation48.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with arrays +Test fscanf() function: usage variations - scientific formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with arrays ***\n"; +echo "*** Test fscanf(): different scientific format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation48.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation49.phpt b/ext/standard/tests/file/fscanf_variation49.phpt index 4e314fb7ce..a681cc01e3 100644 --- a/ext/standard/tests/file/fscanf_variation49.phpt +++ b/ext/standard/tests/file/fscanf_variation49.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with strings ***\n"; +echo "*** Test fscanf(): different scientific format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation49.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt index 750e604586..a39d0b8ae1 100644 --- a/ext/standard/tests/file/fscanf_variation5.phpt +++ b/ext/standard/tests/file/fscanf_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with arrays +Test fscanf() function: usage variations - integer formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with arrays ***\n"; +echo "*** Test fscanf(): different integer format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation5.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt index e46dbdb347..af406a147a 100644 --- a/ext/standard/tests/file/fscanf_variation50.phpt +++ b/ext/standard/tests/file/fscanf_variation50.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with boolean +Test fscanf() function: usage variations - scientific formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; +echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation50.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 0f5ab5a612..46663364d0 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file opened in write only mode +Test fscanf() function: usage variations - file opened in write only mode --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file opened in write only mode $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; +echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; // create a file $filename = "$file_path/fscanf_variation51.tmp"; @@ -39,7 +39,7 @@ $modes = array("w", "wb", "wt", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + $file_handle = fopen($filename, $mode); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt index bf82ab8e43..974ddef8f1 100644 --- a/ext/standard/tests/file/fscanf_variation52.phpt +++ b/ext/standard/tests/file/fscanf_variation52.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - empty file +Test fscanf() function: usage variations - empty file --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - empty file $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read an empty file ***\n"; +echo "*** Test fscanf(): to read an empty file ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,7 +28,7 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation52.tmp"; $file_handle = fopen($filename, "w"); diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt index a553a96693..3cd273488d 100644 --- a/ext/standard/tests/file/fscanf_variation53.phpt +++ b/ext/standard/tests/file/fscanf_variation53.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file pointer pointing to EOF +Test fscanf() function: usage variations - file pointer pointing to EOF --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file pointer pointing to EOF $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; +echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,16 +28,16 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation53.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + //writing data to the file @fwrite($file_handle, "Sample text\n"); - + // writing a blank line @fwrite($file_handle, "\n"); @@ -50,14 +50,14 @@ foreach($modes as $mode) { exit("Error:failed to open file $filename"); } echo "\n-- iteration $counter --\n"; - + // current location var_dump( ftell($file_handle) ); - + // set the file pointer to eof var_dump( fseek($file_handle, 0, SEEK_END) ); - - // current location + + // current location var_dump( ftell($file_handle) ); foreach($formats as $format) { diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt index 0937e5b556..72ba7c84a2 100644 --- a/ext/standard/tests/file/fscanf_variation54.phpt +++ b/ext/standard/tests/file/fscanf_variation54.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - objects $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read objects from a file ***\n"; +echo "*** Test fscanf(): to read objects from a file ***\n"; // declare a class class foo @@ -43,7 +43,7 @@ $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); $counter = 1; -// opening file for read +// opening file for read $file_handle = fopen($filename, "r"); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index 1777f797b2..ec65ec4236 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - tracking file pointer while reading +Test fscanf() function: usage variations - tracking file pointer while reading --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -21,7 +21,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; +echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; // create a file $filename = "$file_path/fscanf_variation55.tmp"; @@ -32,17 +32,17 @@ if($file_handle == false) // different valid data $valid_data = array( 12345, // integer value - -12345, + -12345, 123.45, // float value - -123.45, + -123.45, 0x123B, // hexadecimal value 0x12ab, 0123, // octal value - -0123, + -0123, "abcde", // string 'abcde', 10e3, // exponential value - 10e-3 + 10e-3 ); // various formats $int_formats = array( "%d", "%f", "%s", "%o", "%x", "%u", "%c", "%e"); @@ -72,14 +72,14 @@ foreach($modes as $mode) { // reading different data from file using different formats foreach($int_formats as $int_format) { // current file pointer position - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); // rewind the file so that for every foreach iteration the file pointer starts from bof rewind($file_handle); // current file pointer position after rewind operation - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); echo "\n-- iteration $counter --\n"; while( !feof($file_handle) ) { - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( fscanf($file_handle,$int_format) ); } $counter++; diff --git a/ext/standard/tests/file/fscanf_variation6.phpt b/ext/standard/tests/file/fscanf_variation6.phpt index 74446f0851..0a6c908b2d 100644 --- a/ext/standard/tests/file/fscanf_variation6.phpt +++ b/ext/standard/tests/file/fscanf_variation6.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with strings ***\n"; +echo "*** Test fscanf(): different integer format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation6.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt index 33354e7faa..6466193820 100644 --- a/ext/standard/tests/file/fscanf_variation7.phpt +++ b/ext/standard/tests/file/fscanf_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with boolean +Test fscanf() function: usage variations - integer formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with boolean data ***\n"; +echo "*** Test fscanf(): different integer format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation7.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index b1f5f4e554..25958dc70d 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with float values +Test fscanf() function: usage variations - float formats with float values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with different float values ***\n"; +echo "*** Test fscanf(): different float format types with different float values ***\n"; // create a file $filename = "$file_path/fscanf_variation8.tmp"; @@ -55,7 +55,7 @@ $valid_floats = array( ); // various float formats -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index e4cc6fa3b3..331d8f9c2f 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with integer values ***\n"; +echo "*** Test fscanf(): different float format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation9.tmp"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index a9a54aba14..7167504ce8 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -42,7 +42,7 @@ foreach($file_content_types as $file_content_type){ // set the file pointer to 0 var_dump( rewind($file_handle) ); // Confirm file pointer moves correctly var_dump( ftell($file_handle) ); // confirm the file pointer position - + foreach($whence_set as $whence){ echo "-- Testing fseek() with whence = $whence_string[$whence] --\n"; var_dump( fseek($file_handle,10,$whence) ); //expecting int(0) diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index ab983a2680..b771d41781 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,(binary)$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index 915ab0e558..a86031fd9b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,(binary)$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index 63d0edd5a5..af37362b15 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -23,7 +23,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,(binary)$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt index 9a3a2d5154..0d91f80c83 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fseek(), ftell() & rewind() functions : error conditions - fseek() +Test fseek(), ftell() & rewind() functions : error conditions - fseek() --FILE-- <?php diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index 7f6b2b4a8b..cffc6293bb 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -15,9 +15,9 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all r and a modes ***\n"; $file_modes = array( "r","rb","rt","r+","r+b","r+t", @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle, $count) ); + var_dump( fseek($file_handle, $count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index ad01c3aef1..adb733024b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index 67987cb712..2456d836de 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index 4b84d409f2..7ba6a5ac99 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_SET */ @@ -45,7 +45,7 @@ foreach($file_content_types as $file_content_type){ exit(); } foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 09c83447d8..acc2ae98e8 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index e4029c718a..8346110b21 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index 75f281291d..3f12211b1f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/fseek_ftell_rewind_variation5.tmp"; // this is n /* open the file using $files_modes and perform fseek(),ftell() and rewind() on it */ foreach($file_content_types as $file_content_type){ echo "-- File having data of type ". $file_content_type ." --\n"; - + foreach($file_modes as $file_mode) { echo "-- File opened in mode ".$file_mode." --\n"; create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 512, "w", "fseek_ftell_rewind_variation" @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index d4519123c6..f905bf025d 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 44519884a9..6246c83d79 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index f0e8e4619f..646b8b659a 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_END */ @@ -44,11 +44,11 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size, the size will have increased // by 10 bytes because of holes fclose($file_handle); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index 5586e2bd5a..61f910c6ce 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index a2a0d676c2..a6089dc84c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt index 914c6d0e42..ec698a4108 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ @@ -62,9 +62,9 @@ $values = array( // string data "string", 'string', - + // object data - new testClass(), + new testClass(), // undefined data $undefined_var, diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt index cb88c03525..3a5cd9db7c 100644 --- a/ext/standard/tests/file/fseek_variation2.phpt +++ b/ext/standard/tests/file/fseek_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index c29ed31759..5a1fae2b86 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fseek() function : variation functionality beyond file boundaries +Test fseek() function : variation functionality beyond file boundaries --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ diff --git a/ext/standard/tests/file/fstat.phpt b/ext/standard/tests/file/fstat.phpt index 96924af077..94ba9c5abf 100644 --- a/ext/standard/tests/file/fstat.phpt +++ b/ext/standard/tests/file/fstat.phpt @@ -13,7 +13,7 @@ var_dump(fstat($fp)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(26) { [0]=> int(%i) diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt index d75ddb9a76..c3c15295dd 100644 --- a/ext/standard/tests/file/fstat_error.phpt +++ b/ext/standard/tests/file/fstat_error.phpt @@ -3,7 +3,7 @@ Test function fstat() by calling it more than or less than its expected argument --FILE-- <?php $fp = fopen (__FILE__, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(fstat( $fp, $extra_arg ) ); var_dump(fstat()); diff --git a/ext/standard/tests/file/ftruncate.phpt b/ext/standard/tests/file/ftruncate.phpt Binary files differindex acc4e8afa3..67b070c836 100644 --- a/ext/standard/tests/file/ftruncate.phpt +++ b/ext/standard/tests/file/ftruncate.phpt diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 40dcf4cf51..60b4e96278 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -17,18 +17,18 @@ echo "\n Initial file size = ".filesize($filename)."\n"; echo "-- Testing ftruncate() with less than expected number of arguments --\n"; -// zero arguments +// zero arguments var_dump( ftruncate() ); // arguments less than expected numbers var_dump( ftruncate( $file_handle ) ); -// check the first size +// check the first size var_dump( filesize($filename) ); echo "-- Testing ftruncate() with more than expected number of arguments --\n"; -// more than expected number of arguments +// more than expected number of arguments var_dump( ftruncate($file_handle, 10, 20) ); -// check the first size +// check the first size var_dump( filesize($filename) ); // test invalid arguments : non-resources @@ -53,18 +53,18 @@ 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 +// 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 +// check the first size var_dump( filesize($filename) ); echo "Done\n"; -?> +?> --CLEAN-- <?php $filename = dirname(__FILE__)."/ftruncate_error.tmp"; diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index 36994cb182..6e7d0d7e60 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index dbf1896d27..7b99f4b252 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index cf51e2092c..ddcbd92534 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt index 7b2e0b42ee..65a0b85b40 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt index e01a167a38..821ed151bd 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt index d9aa40e6e7..885a8b35a5 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt index cdbeb8e57f..219fba16c5 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/ftruncate_variation4-win32.phpt b/ext/standard/tests/file/ftruncate_variation4-win32.phpt index 5bf5f679b6..18d5138baf 100644 --- a/ext/standard/tests/file/ftruncate_variation4-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation4-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation4.phpt b/ext/standard/tests/file/ftruncate_variation4.phpt index ef0ee21996..077b46fd05 100644 --- a/ext/standard/tests/file/ftruncate_variation4.phpt +++ b/ext/standard/tests/file/ftruncate_variation4.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index eb45ffcdac..4415cf54e8 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt index 5d282d13de..11083df58b 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt index 0815092e2b..d231ed18a4 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt index e9d5eb3c94..9f72333b3a 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index dc3a4cc10b..84e13a9b97 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } - rewind($file_handle); // file pointer to 0 - + rewind($file_handle); // file pointer to 0 + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 5b38adf8bf..90181723a5 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } - rewind($file_handle); // file pointer to 0 - + rewind($file_handle); // file pointer to 0 + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/fwrite.phpt b/ext/standard/tests/file/fwrite.phpt index 7f12ebb1ee..443710b99d 100644 --- a/ext/standard/tests/file/fwrite.phpt +++ b/ext/standard/tests/file/fwrite.phpt @@ -29,7 +29,7 @@ var_dump(file_get_contents($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d bool(false) diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index a65d81efb8..e3bb39a62b 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32私はガラスを食べられます.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index 81d9360276..52d3d033c1 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index c568b7c874..e11606ade3 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index 119302a13a..6af00e1121 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -19,7 +19,7 @@ $filename = dirname(__FILE__)."/fwrite_error.tmp"; echo "-- Testing fwrite() with less than expected number of arguments --\n"; // zero argument -var_dump( fwrite() ); +var_dump( fwrite() ); // less than expected, 1 arg $file_handle = fopen ( $filename, "w"); var_dump( fwrite($file_handle) ); @@ -52,14 +52,14 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) { var_dump( fwrite($invalid_args[$loop_counter - 1], 10) ); } -// fwrite() on a file handle which is already closed +// fwrite() on a file handle which is already closed echo "-- Testing fwrite() with closed/unset file handle --\n"; fclose($file_handle); var_dump(fwrite($file_handle,"data")); -// fwrite on a file handle which is unset +// fwrite on a file handle which is unset $fp = fopen($filename, "w"); -unset($fp); //unset file handle +unset($fp); //unset file handle var_dump( fwrite(@$fp,"data")); echo "Done\n"; diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index e43a04dfd6..c109aeef0f 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 1091aeb60b..38d35e3612 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 44f69392e4..133405a5f1 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -36,7 +36,7 @@ foreach($file_content_types as $file_content_type) { /* open the file using $files_modes and perform fwrite() on it */ foreach($file_modes as $file_mode) { echo "-- Opening file in $file_mode --\n"; - + // create the temp file with content of type $file_content_type $filename = dirname(__FILE__)."/fwrite_variation1.tmp"; // this is name of the file create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fwrite_variation"); @@ -50,14 +50,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ var_dump( ftell($file_handle) ); // expected: 0 - var_dump( fwrite($file_handle, $data_to_be_written )); + var_dump( fwrite($file_handle, $data_to_be_written )); var_dump( ftell($file_handle) ); // expected: 0 - var_dump( feof($file_handle) ); // expected: false - + var_dump( feof($file_handle) ); // expected: false + // move the file pointer to end of the file and try fwrite() fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expecting 1024 diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index 8545db9691..d8a6afdfd1 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 34804b6959..ee445448f4 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ @@ -61,14 +61,14 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); //Expecting bool(false) /*overwrite data in middle of the file*/ - fseek($file_handle, SEEK_SET, 1024/2 ); + fseek($file_handle, SEEK_SET, 1024/2 ); var_dump( ftell($file_handle)); // expected: 1024/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) /* write at the end of the file */ - fseek($file_handle, SEEK_END, 0); + fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expected: 1024 var_dump( feof($file_handle) ); var_dump( fwrite($file_handle, $data_to_be_written, 200) ); diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index 125f88df7e..47cfd18e0a 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer var_dump( ftell($file_handle) ); // expected: 1024 diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index 7d635fdae9..a3c8a76964 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer @@ -64,9 +64,9 @@ foreach($file_content_types as $file_content_type) { fseek($file_handle, SEEK_SET, (1024 + 400)/2 ); var_dump( ftell($file_handle)); // expected: (1024 + 400)/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) - + /* check the filesize and display file content */ // close the file, get the size and content of the file. var_dump( fclose($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index ed2114e272..76d1385bab 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index eefc2f8837..39eeae13fc 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt index b12af3182b..7afa91216e 100644 --- a/ext/standard/tests/file/fwrite_variation5.phpt +++ b/ext/standard/tests/file/fwrite_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fwrite() function : usage variation +Test fwrite() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int fwrite(resource fp, string str [, int length]) - * Description: Binary-safe file write + * Description: Binary-safe file write * Source code: ext/standard/file.c * Alias to functions: bzwrite fputs gzwrite */ diff --git a/ext/standard/tests/file/get_current_user.phpt b/ext/standard/tests/file/get_current_user.phpt index b67195b629..f23d2fabef 100644 --- a/ext/standard/tests/file/get_current_user.phpt +++ b/ext/standard/tests/file/get_current_user.phpt @@ -8,7 +8,7 @@ var_dump(get_current_user()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d NULL string(%d) %s diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index e459c6a1aa..5f59c87d51 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -8,7 +8,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD' EOD; /*<?*/ -class mystream +class mystream { public $path; public $mode; @@ -20,7 +20,7 @@ class mystream function url_stat($path, $flags) { return array(); } - + function stream_stat() { return array(); } @@ -32,7 +32,7 @@ class mystream $this->options = $options; $split = parse_url($path); - if ($split["host"] !== b"GLOBALS" || + if ($split["host"] !== b"GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; @@ -43,7 +43,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_001.phpt b/ext/standard/tests/file/include_userstream_001.phpt index d805afd204..d769a4f3b2 100644 --- a/ext/standard/tests/file/include_userstream_001.phpt +++ b/ext/standard/tests/file/include_userstream_001.phpt @@ -15,7 +15,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index 4841d39c51..cc1887c446 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 2b439cfa25..470982d9b8 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt index 65efeab9a1..76b8e8bc0c 100644 --- a/ext/standard/tests/file/is_dir_variation2.phpt +++ b/ext/standard/tests/file/is_dir_variation2.phpt @@ -24,14 +24,14 @@ mkdir($dirname); var_dump( is_dir($dirname) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink"); -var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks +var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks clearstatcache(); echo "-- With hardlink --"; link($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_link"); //Not permitted to create hard-link to a dir -var_dump( is_dir($file_path."/is_dir_variation2_link") ); +var_dump( is_dir($file_path."/is_dir_variation2_link") ); clearstatcache(); echo "\n*** Testing is_dir() with file and links to a file ***\n"; @@ -41,7 +41,7 @@ fclose( fopen($filename, "w") ); var_dump( is_dir($filename) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2.tmp", $file_path."/is_dir_variation2_symlink.tmp"); var_dump( is_dir($file_path."/is_dir_variation2_symlink.tmp") ); clearstatcache(); diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt index 41826ad7ec..2070374117 100644 --- a/ext/standard/tests/file/is_dir_variation3.phpt +++ b/ext/standard/tests/file/is_dir_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- <?php /* Prototype: bool is_dir ( string $dirname ); diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt index c0a04e64bb..b5ee664566 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/is_executable.tmp"; create_file($filename); $counter = 1; -/* loop to check if the file with new mode is executable +/* loop to check if the file with new mode is executable using is_executable() */ for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Changing mode of file to $mode --\n"; diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt index 231f1bff3f..1cd0a8d209 100644 --- a/ext/standard/tests/file/is_executable_variation1.phpt +++ b/ext/standard/tests/file/is_executable_variation1.phpt @@ -35,19 +35,19 @@ $files_arr = array( /* Testing file with double slashes */ "$file_path/is_executable_variation1//bar.tmp", "$file_path/is_executable_variation1/*.tmp", - "$file_path/is_executable_variation1/b*.tmp", + "$file_path/is_executable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_executable_variation1".chr(0)."bar.temp", "$file_path".chr(0)."is_executable_variation1/bar.temp", "$file_path/is_executable_variation1x000/", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_executable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index fc804d652a..fe9cb8f366 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -5,7 +5,7 @@ Test is_executable() function: usage variations - file/dir with diff. perms if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip not for windows'); } -// Skip if being run by root +// Skip if being run by root $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; $fp = fopen($filename, 'w'); fclose($fp); diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt index 925f9963c0..b9f734d448 100644 --- a/ext/standard/tests/file/is_executable_variation3.phpt +++ b/ext/standard/tests/file/is_executable_variation3.phpt @@ -41,7 +41,7 @@ $invalid_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach( $invalid_files as $invalid_file ) { var_dump( is_executable($invalid_file) ); diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index 92bff954c6..8f09e93aa6 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -7,7 +7,7 @@ Test is_file() function: usage variations - diff. files Returns TRUE if the filename exists and is a regular file */ -/* Testing is_file() with file containing data, truncating its size +/* Testing is_file() with file containing data, truncating its size and the file created by touch() */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index dbe74da617..cbe15ada71 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Returns TRUE if the filename exists and is a regular file */ -/* Creating soft and hard links to a file and applying is_file() on links */ +/* Creating soft and hard links to a file and applying is_file() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/is_file_variation2.tmp", "w") ); diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt index 2a13e46779..6a6d76f793 100644 --- a/ext/standard/tests/file/is_file_variation3.phpt +++ b/ext/standard/tests/file/is_file_variation3.phpt @@ -22,12 +22,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( is_file($filename) ); diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt index b927446b7c..505331d2c9 100644 --- a/ext/standard/tests/file/is_file_variation4.phpt +++ b/ext/standard/tests/file/is_file_variation4.phpt @@ -27,7 +27,7 @@ $files_arr = array( "/is_file_variation4//is_file_variation4.tmp", "//is_file_variation4//is_file_variation4.tmp", "/is_file_variation4/*.tmp", - "is_file_variation4/is_file*.tmp", + "is_file_variation4/is_file*.tmp", /* Testing Binary safe */ "/is_file_variation4/is_file_variation4.tmp".chr(0), diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt index 5becac00a2..0ba2324f9a 100644 --- a/ext/standard/tests/file/is_readable_variation1.phpt +++ b/ext/standard/tests/file/is_readable_variation1.phpt @@ -44,19 +44,19 @@ $files_arr = array( "$file_path/is_readable_variation1//bar.tmp", "$file_path//is_readable_variation1//bar.tmp", "$file_path/is_readable_variation1/*.tmp", - "$file_path/is_readable_variation1/b*.tmp", + "$file_path/is_readable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_readable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_readable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt index dc4d3b16f3..3de5f1623e 100644 --- a/ext/standard/tests/file/is_readable_variation3.phpt +++ b/ext/standard/tests/file/is_readable_variation3.phpt @@ -40,7 +40,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a readable file */ foreach( $misc_files as $misc_file ) { var_dump( is_readable($misc_file) ); diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt index 718c7fb8e9..f5cdf6a8a0 100644 --- a/ext/standard/tests/file/is_writable_variation1.phpt +++ b/ext/standard/tests/file/is_writable_variation1.phpt @@ -46,19 +46,19 @@ $files_arr = array( "$file_path/is_writable_variation1//bar.tmp", "$file_path//is_writable_variation1//bar.tmp", "$file_path/is_writable_variation1/*.tmp", - "$file_path/is_writable_variation1/b*.tmp", + "$file_path/is_writable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_writable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_writable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt index 66a80abf1e..6b79934760 100644 --- a/ext/standard/tests/file/is_writable_variation3.phpt +++ b/ext/standard/tests/file/is_writable_variation3.phpt @@ -38,7 +38,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach( $misc_files as $misc_file ) { var_dump( is_writable($misc_file) ); diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index f2aff597c5..ed8f96dde4 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : basic functionality +Test lchown() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); @@ -10,7 +10,7 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()"); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt index 8632495b39..f4b4f5089e 100644 --- a/ext/standard/tests/file/lchown_error.phpt +++ b/ext/standard/tests/file/lchown_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : error functionality +Test lchown() function : error functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); @@ -19,7 +19,7 @@ unlink($filename); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : error functionality ***\n"; diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt index 0d1476d68d..ec11e2f839 100644 --- a/ext/standard/tests/file/lstat_stat_basic.phpt +++ b/ext/standard/tests/file/lstat_stat_basic.phpt @@ -54,8 +54,8 @@ sleep(2); $new_file_stat = stat($filename); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat() and lstat() : validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true @@ -66,7 +66,7 @@ var_dump( compare_self_stat($link_stat) ); // expect true var_dump( compare_self_stat($new_file_stat) ); //expect true var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating files and link, also dump the value of stats echo "*** Testing stat() and lstat() : comparing stats (recorded before and after file/link creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt index 385167fe32..8f290a32e3 100644 --- a/ext/standard/tests/file/lstat_stat_error.phpt +++ b/ext/standard/tests/file/lstat_stat_error.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing lstat() for error conditions ***\n"; -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); var_dump( lstat() ); // args < expected var_dump( lstat(__FILE__, 2) ); // args > expected var_dump( lstat("$file_path/temp.tmp") ); // non existing file diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index 30ce9b7217..9335ce9ef8 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -34,11 +34,11 @@ clearstatcache(); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 8e1edd66c7..f9413f768f 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of is_link() +Test lstat() and stat() functions: usage variations - effects of is_link() --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index 288e0b5ecf..17b6262a52 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - file opened using w and r mode +Test lstat() and stat() functions: usage variations - file opened using w and r mode --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index 517f77e3f5..41106a80fc 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - hardlink +Test lstat() and stat() functions: usage variations - hardlink --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -28,7 +28,7 @@ fclose($fp); echo "*** Checking lstat() and stat() on hard link ***\n"; $linkname = "$file_path/lstat_stat_variation14_hard.tmp"; -//ensure that link doesn't exists +//ensure that link doesn't exists @unlink($linkname); // create the link diff --git a/ext/standard/tests/file/lstat_stat_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt index 6ee563d684..4ac01f2035 100644 --- a/ext/standard/tests/file/lstat_stat_variation18.phpt +++ b/ext/standard/tests/file/lstat_stat_variation18.phpt @@ -38,15 +38,15 @@ class names { // directory name stored in an object $dir_name = new names("$file_path/lstat_stat_variation18"); -// file name stored in an object +// file name stored in an object $file_name = new names("$file_path/lstat_stat_variation18.tmp"); echo "\n-- Testing stat() on filename stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($file_name->var_name) ); echo "\n-- Testing stat() on directory name stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($dir_name->var_name) ); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt index c481575ce9..fedf0bd154 100644 --- a/ext/standard/tests/file/lstat_stat_variation19.phpt +++ b/ext/standard/tests/file/lstat_stat_variation19.phpt @@ -32,7 +32,7 @@ echo "*** Testing stat() with filename & directory name stored inside an array * // array with default numeric index $names = array( - "$file_path/lstat_stat_variation19.tmp", + "$file_path/lstat_stat_variation19.tmp", "$file_path/lstat_stat_variation19" ); diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index e7d704a20b..aaf77b9e3d 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -37,7 +37,7 @@ 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, +$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) ); diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt index 8dcd70c798..ad0f586f1b 100644 --- a/ext/standard/tests/file/lstat_stat_variation20.phpt +++ b/ext/standard/tests/file/lstat_stat_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - link names stored in array/object +Test lstat() and stat() functions: usage variations - link names stored in array/object --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -37,8 +37,8 @@ class names { // link name stored in an object $link_object = new names("$file_path/lstat_stat_variation20_link.tmp"); -// link name stored in side an array -// with default numeric key +// link name stored in side an array +// with default numeric key $link_array = array("$file_path/lstat_stat_variation20_link.tmp"); // with string key index diff --git a/ext/standard/tests/file/lstat_stat_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt index e7bae3abb4..43f8bf6187 100644 --- a/ext/standard/tests/file/lstat_stat_variation3.phpt +++ b/ext/standard/tests/file/lstat_stat_variation3.phpt @@ -41,7 +41,7 @@ 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, +$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) ); diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index d0c096ef19..9e03e5c7d9 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -26,7 +26,7 @@ require "$file_path/file.inc"; /* create temp directory */ $dir_name = "$file_path/lstat_stat_variation5"; -@rmdir($dir_name); //ensure that dir doesn't exists +@rmdir($dir_name); //ensure that dir doesn't exists mkdir($dir_name); // temp dir // touch a directory and check stat, there should be difference in atime diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index 7e557d034a..ea2b92f975 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of touch() on link +Test lstat() and stat() functions: usage variations - effects of touch() on link --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt index b0f170d1f2..8cf15a2fee 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats with creating file/subdir in a dir +/* test the effects on stats with creating file/subdir in a dir */ /* create temp file */ diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index 63c6ff8a76..4d9e52f903 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats by deleting file/subdir from a dir +/* test the effects on stats by deleting file/subdir from a dir */ echo "*** Testing stat() for comparing stats after the deletion of subdir and file ***\n"; diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt index d1a7cebfa7..5a758bb612 100644 --- a/ext/standard/tests/file/mkdir-001.phpt +++ b/ext/standard/tests/file/mkdir-001.phpt @@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt index d149098df0..92c05e941d 100644 --- a/ext/standard/tests/file/mkdir-002.phpt +++ b/ext/standard/tests/file/mkdir-002.phpt @@ -30,7 +30,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-002")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) string(%d) "%s diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index fdd49f340f..dde6b35550 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index 45c275106a..eb6c55ac1d 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index af2387ca73..b8f104fb79 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt index 17f54926cb..cee03858cb 100644 --- a/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php.net bug outputs message File Exists 'single space' => ' ', diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt index b5254034be..c77c66b531 100644 --- a/ext/standard/tests/file/mkdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir() function : usage variation: try invalid pathname +Test mkdir() function : usage variation: try invalid pathname --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 67316f2c14..430c36ec99 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt index 7622e5f612..482c3c0206 100644 --- a/ext/standard/tests/file/mkdir_variation3.phpt +++ b/ext/standard/tests/file/mkdir_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt index deb6ff4a45..c44a530e1e 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index c7ebd518da..b805dee3be 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -29,35 +29,35 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir $unixifiedDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt index 8a02fe1d67..ea60edf42f 100644 --- a/ext/standard/tests/file/mkdir_variation5.phpt +++ b/ext/standard/tests/file/mkdir_variation5.phpt @@ -1,18 +1,18 @@ --TEST-- -Test mkdir() function : variation: various valid and invalid paths +Test mkdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -27,32 +27,32 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index db14c7a9b4..a79951e013 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -4,7 +4,7 @@ Test parse_ini_file() function <?php /* Prototype: array parse_ini_file(string $filename [,bool $process_sections]); Description: parse_ini_file() loads in the ini file specified in filename, - and returns the settings in it in an associative array. + and returns the settings in it in an associative array. */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 14990b2606..29e022fb13 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_ini_file() function : error conditions +Test parse_ini_file() function : error conditions --FILE-- <?php /* Prototype : proto array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : error conditions ***\n"; @@ -23,7 +23,7 @@ var_dump( parse_ini_file($filename, $process_sections, $extra_arg) ); echo "\n-- Testing parse_ini_file() function with a non-existent file --\n"; $filename = __FILE__ . 'invalidfilename'; -var_dump( parse_ini_file($filename, $process_sections) ); +var_dump( parse_ini_file($filename, $process_sections) ); echo "Done"; ?> diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index a24bc1c051..666ea433b1 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt index 20ad6bb067..e7b9091737 100644 --- a/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt index 43b0274ea9..96d44433f7 100644 --- a/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -32,7 +32,7 @@ foreach($newdirs as $newdir) { set_include_path($newIncludePath); $path = get_include_path(); echo "New include path is : " . $path . "\n"; - + $output_file = $dir2."/".$iniFile; $iniContent = <<<FILE error_reporting = E_ALL diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt index 66cab3bedc..e80c25822d 100644 --- a/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index eea7b7decc..2cf2013988 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -1,13 +1,13 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index 4e5d4347e4..432441ae6e 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 6dfbee990a..7d5b650cc3 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index e9844e905a..a4f24e4e13 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'ParseIniFileVar6.ini'; diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt index 53eda5a64e..0f5e279a5b 100644 --- a/ext/standard/tests/file/pathinfo_basic.phpt +++ b/ext/standard/tests/file/pathinfo_basic.phpt @@ -45,7 +45,7 @@ $paths = array ( /* Testing with homedir notation */ "~/PHP/php5.2.0/", - + /* Testing normal directory notation */ "/home/example/test/", "http://httpd.apache.org/core.html#acceptpathinfo" diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index f783a6b179..ea95ed1e2b 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index 92f0524da4..f7cec51c7b 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', diff --git a/ext/standard/tests/file/pathinfo_basic2-win32.phpt b/ext/standard/tests/file/pathinfo_basic2-win32.phpt index 4c2fd2cacf..5a88b648d3 100644 --- a/ext/standard/tests/file/pathinfo_basic2-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic2-win32.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 23c0768ded..ea5bd2d163 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; diff --git a/ext/standard/tests/file/pathinfo_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt index ff4c1eb818..36d9bab5ae 100644 --- a/ext/standard/tests/file/pathinfo_variation1.phpt +++ b/ext/standard/tests/file/pathinfo_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index ea7c2d77a8..d0c1b37a52 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index 333aa56838..b8509dc8ec 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index d6c6c774b4..421f378e01 100644 --- a/ext/standard/tests/file/pathinfo_variaton.phpt +++ b/ext/standard/tests/file/pathinfo_variaton.phpt @@ -57,7 +57,7 @@ $paths = array ( /* pathname as NULL */ NULL, null, - + /* filename as resource */ $fp, diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index a6ffd0630f..c1fbf4a2e1 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pclose() function : usage variation +Test pclose() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int pclose(resource fp) - * Description: Close a file pointer opened by popen() + * Description: Close a file pointer opened by popen() * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pclose() : usage variation ***\n"; diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index 51f4d9f171..1c5defdaef 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -1,7 +1,7 @@ --TEST-- php://fd wrapper: invalid file descriptor --SKIPIF-- -<?php include('skipif.inc'); +<?php include('skipif.inc'); if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index 7e0a0e0c54..6dd995b43c 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 6351d866f3..2b05b25a13 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 9812193c66..ecbd885a65 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test popen() and pclose function: basic functionality +Test popen() and pclose function: basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt index 3348403e2b..3e09d54e0f 100644 --- a/ext/standard/tests/file/proc_open01.phpt +++ b/ext/standard/tests/file/proc_open01.phpt @@ -4,10 +4,10 @@ proc_open() regression test 1 (proc_open() leak) <?php $pipes = array(1, 2, 3); $orig_pipes = $pipes; -$php = getenv('TEST_PHP_EXECUTABLE'); +$php = getenv('TEST_PHP_EXECUTABLE'); if ($php === false) { die("no php executable defined"); -} +} $proc = proc_open( "$php -n", array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')), @@ -24,7 +24,7 @@ fflush($pipes[0]); fclose($pipes[0]); $cnt = ''; $n=0; -for ($left = strlen($test_string); $left > 0;) { +for ($left = strlen($test_string); $left > 0;) { if (++$n >1000) { print "terminated after 1000 iterations\n"; break; diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 61f6aba7a5..a240a826b9 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -10,16 +10,16 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ "-1" => -1, "TRUE" => TRUE, "FALSE" => FALSE, @@ -30,7 +30,7 @@ $names_arr = array( "array()" => array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt Binary files differindex 3bbc329f31..59b92ad365 100644 --- a/ext/standard/tests/file/readfile_variation10.phpt +++ b/ext/standard/tests/file/readfile_variation10.phpt diff --git a/ext/standard/tests/file/readfile_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt index 854642a36d..a22b2b4044 100644 --- a/ext/standard/tests/file/readfile_variation3.phpt +++ b/ext/standard/tests/file/readfile_variation3.phpt @@ -7,7 +7,7 @@ Test readfile() function: usage variation - include path */ /* test readfile() by providing an include path, second argument */ -// include file.inc +// include file.inc require("file.inc"); $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 9ee5a2f3c7..1df3690849 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt index 21856f8135..04b0477154 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index 02e708220c..dca6f4df67 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index d26f52f492..b41721ae4f 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index e53f362367..b4fb0bf322 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index a66af5d25b..dde7a1ec7a 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index c802f4018a..cf80caae99 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/readlink_realpath_basic1.phpt b/ext/standard/tests/file/readlink_realpath_basic1.phpt index 99195e2b24..6efe7f2d49 100644 --- a/ext/standard/tests/file/readlink_realpath_basic1.phpt +++ b/ext/standard/tests/file/readlink_realpath_basic1.phpt @@ -26,7 +26,7 @@ fclose($file_handle1); fclose($file_handle2); fclose($file_handle3); -symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", +symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp"); symlink("$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp"); @@ -38,7 +38,7 @@ $linknames = array ( "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp", - + /* linknames with invalid linkpath */ "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp", diff --git a/ext/standard/tests/file/readlink_realpath_variation1.phpt b/ext/standard/tests/file/readlink_realpath_variation1.phpt index 341e39a9de..ab1d955778 100644 --- a/ext/standard/tests/file/readlink_realpath_variation1.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation1.phpt @@ -36,30 +36,30 @@ $obj1 = new object_temp("$name_prefix/readlink_realpath_variation1/../././readli $obj2 = new object_temp("$name_prefix/readlink_realpath_variation1/home/../..///readlink_realpath_variation1_link.tmp"); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an object --\n"; -// creating the links -var_dump( symlink($filename, $obj1->linkname) ); -var_dump( readlink($obj1->linkname) ); +// creating the links +var_dump( symlink($filename, $obj1->linkname) ); +var_dump( readlink($obj1->linkname) ); var_dump( realpath($obj1->linkname) ); -var_dump( symlink($filename, $obj2->linkname) ); +var_dump( symlink($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); var_dump( realpath($obj2->linkname) ); // deleting the link unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an object --\n"; // creating hard links -var_dump( link($filename, $obj1->linkname) ); +var_dump( link($filename, $obj1->linkname) ); var_dump( readlink($obj1->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj1->linkname) ); -var_dump( link($filename, $obj2->linkname) ); +var_dump( link($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj2->linkname) ); -// delete the links +// delete the links unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index 0e748576ae..c7add6b037 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -31,31 +31,31 @@ $link_arr = array ( ); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n"; -// creating the links -var_dump( symlink($filename, $link_arr[0]) ); -var_dump( readlink($link_arr[0]) ); -var_dump( realpath($link_arr[0]) ); -var_dump( symlink($filename, $link_arr[1]) ); +// creating the links +var_dump( symlink($filename, $link_arr[0]) ); +var_dump( readlink($link_arr[0]) ); +var_dump( realpath($link_arr[0]) ); +var_dump( symlink($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); var_dump( realpath($link_arr[1]) ); // deleting the link unlink($link_arr[0]); -unlink($link_arr[1]); +unlink($link_arr[1]); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an array --\n"; // creating hard links -var_dump( link($filename, $link_arr[0]) ); +var_dump( link($filename, $link_arr[0]) ); var_dump( readlink($link_arr[0]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[0]) ); -var_dump( link($filename, $link_arr[1]) ); +var_dump( link($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[1]) ); -// delete the links +// delete the links unlink($link_arr[0]); -unlink($link_arr[1]); - +unlink($link_arr[1]); + echo "Done\n"; ?> --CLEAN-- diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt index 3766a5b43a..58e58237ef 100644 --- a/ext/standard/tests/file/readlink_realpath_variation3.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing readlink() and realpath() : usage variations ***\n"; - + echo "\n*** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***\n"; $link_string = array ( /* linkname as spaces */ @@ -34,8 +34,8 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) { echo $loop_counter + 1; echo " --\n"; - var_dump( readlink($link_string[$loop_counter]) ); - var_dump( realpath($link_string[$loop_counter]) ); + var_dump( readlink($link_string[$loop_counter]) ); + var_dump( realpath($link_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt index d4f1a5ff02..c66e2a4265 100644 --- a/ext/standard/tests/file/readlink_variation1.phpt +++ b/ext/standard/tests/file/readlink_variation1.phpt @@ -27,12 +27,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( readlink($filename) ); diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt index 0eb9dc519a..f16995eaa2 100644 --- a/ext/standard/tests/file/realpath_cache.phpt +++ b/ext/standard/tests/file/realpath_cache.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(4) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt index e74a6565a7..bb8016875a 100644 --- a/ext/standard/tests/file/realpath_cache_win32.phpt +++ b/ext/standard/tests/file/realpath_cache_win32.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(8) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt index 66d7c8b0c7..25ea530894 100644 --- a/ext/standard/tests/file/realpath_variation-win32-mb.phpt +++ b/ext/standard/tests/file/realpath_variation-win32-mb.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation_私はガラスを食べられます/home/../home//tests//..//..//..//home//realpath_variation_私はガラスを食べられます.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt index f58f618993..8049d4c69a 100644 --- a/ext/standard/tests/file/realpath_variation-win32.phpt +++ b/ext/standard/tests/file/realpath_variation-win32.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation/home/../home//tests//..//..//..//home//realpath_variation.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index a5031aa7b5..0c8bdb87e5 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -10,23 +10,23 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) --FILE-- <?php /* Prototype : string realpath(string path) - * Description: Return the resolved path + * Description: Return the resolved path * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing realpath() : variation ***\n"; -$paths = array('c:\\', - 'c:', - 'c' , - '\\' , - '/', - 'c:temp', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c' , + '\\' , + '/', + 'c:temp', + 'c:\\/', '/tmp/', - '/tmp/\\', - '\\tmp', + '/tmp/\\', + '\\tmp', '\\tmp\\'); foreach($paths as $path) { diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt index c589c514e4..238333e776 100644 --- a/ext/standard/tests/file/rename_basic.phpt +++ b/ext/standard/tests/file/rename_basic.phpt @@ -25,7 +25,7 @@ var_dump( file_exists($dest_name) ); // expecting true $new_stat = stat("$file_path/rename_basic_new.tmp"); // checking statistics of old and renamed file - both should be same except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$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) ); diff --git a/ext/standard/tests/file/rename_error.phpt b/ext/standard/tests/file/rename_error.phpt index fae2b4f373..e0ea2043c9 100644 --- a/ext/standard/tests/file/rename_error.phpt +++ b/ext/standard/tests/file/rename_error.phpt @@ -8,7 +8,7 @@ Test rename() function: error conditions echo "*** Testing rename() for error conditions ***\n"; //Zero argument -var_dump( rename() ); +var_dump( rename() ); // less than expected,1 argument var_dump( rename(__FILE__) ); @@ -17,7 +17,7 @@ var_dump( rename(__FILE__) ); $context = stream_context_create(); $filename = __FILE__; $new_filename = __FILE__.".tmp"; -var_dump( rename($filename, $new_filename, $context, "extra_args") ); +var_dump( rename($filename, $new_filename, $context, "extra_args") ); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index a10c6dfbe7..828837a84d 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -41,16 +41,16 @@ foreach($src_filenames as $src_filename) { $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index 00dc309982..2f25d193f5 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -33,17 +33,17 @@ foreach($src_filenames as $src_filename) { fclose($fp); $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } // clean the temp dir and file -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 0955096d76..2196e10721 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -45,7 +45,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index 54338d7460..f37bba0108 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation1/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt index 42909ee484..52efd78348 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index c13a09a951..e940f78070 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with absolute and relative paths ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index de5fc14004..064daa4dfe 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt index 168beeffc9..a423496fbc 100644 --- a/ext/standard/tests/file/rename_variation12.phpt +++ b/ext/standard/tests/file/rename_variation12.phpt @@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip.. not for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt Binary files differindex a5030761a5..894cfb2614 100644 --- a/ext/standard/tests/file/rename_variation13-win32.phpt +++ b/ext/standard/tests/file/rename_variation13-win32.phpt diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index ec1ee7c78d..2686150f23 100644 --- a/ext/standard/tests/file/rename_variation13.phpt +++ b/ext/standard/tests/file/rename_variation13.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with obscure files ***\n"; @@ -21,9 +21,9 @@ $aFile = $file_path.'/afile.tmp'; mkdir($file_path); -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -34,7 +34,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt index 1e0a5d9edd..5b0591b0ce 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -29,7 +29,7 @@ var_dump(symlink($filename, $linkname)); //rename the link to a new name in the same dir $dest_linkname = $file_path."/rename_variation2_soft_link2.tmp"; var_dump( rename( $linkname, $dest_linkname) ); -//ensure that link was renamed +//ensure that link was renamed clearstatcache(); var_dump( file_exists($linkname) ); // expecting false var_dump( file_exists($dest_linkname) ); // expecting true @@ -41,7 +41,7 @@ clearstatcache(); var_dump( file_exists($dest_linkname) ); // expecting false var_dump( file_exists($dest_dir."/rename_variation2_soft_link2.tmp") ); // expecting true -// delete the link file now +// delete the link file now unlink($dest_dir."/rename_variation2_soft_link2.tmp"); echo "Done\n"; diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index b5da587811..5f071fb5b9 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -16,13 +16,13 @@ require dirname(__FILE__).'/file.inc'; /* creating directory */ $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation3_dir"; +$dirname = "$file_path/rename_variation3_dir"; mkdir($dirname); /* test rename() by trying to rename an existing file/dir to the same name and one another */ -$filename = "$file_path/rename_variation3.tmp"; +$filename = "$file_path/rename_variation3.tmp"; $fp = fopen($filename, "w"); if (!$fp) { die("Cannot create $filename\n"); diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt index 2518cf48ea..8ea2499eed 100644 --- a/ext/standard/tests/file/rename_variation5.phpt +++ b/ext/standard/tests/file/rename_variation5.phpt @@ -11,12 +11,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* test rename() by trying to rename an existing file/dir/link to the same name and one another */ -// create a dir +// create a dir $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation5_dir"; +$dirname = "$file_path/rename_variation5_dir"; mkdir($dirname); //create a file -$filename = "$file_path/rename_variation5.tmp"; +$filename = "$file_path/rename_variation5.tmp"; $fp = fopen($filename, "w"); fclose($fp); // create a link diff --git a/ext/standard/tests/file/rename_variation6-win32.phpt b/ext/standard/tests/file/rename_variation6-win32.phpt index dfb57f2e19..9129bd871e 100644 --- a/ext/standard/tests/file/rename_variation6-win32.phpt +++ b/ext/standard/tests/file/rename_variation6-win32.phpt @@ -34,7 +34,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): %s in %s on line %d bool(false) string(%d) "%srename_variation6-win32.php.tmp" diff --git a/ext/standard/tests/file/rename_variation6.phpt b/ext/standard/tests/file/rename_variation6.phpt index 413dc6e045..3385d14134 100644 --- a/ext/standard/tests/file/rename_variation6.phpt +++ b/ext/standard/tests/file/rename_variation6.phpt @@ -28,7 +28,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%srename_variation6.php.tmp" diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt index 369e8c2d43..a9643b4491 100644 --- a/ext/standard/tests/file/rename_variation7-win32.phpt +++ b/ext/standard/tests/file/rename_variation7-win32.phpt @@ -25,7 +25,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/rename_variation7.phpt b/ext/standard/tests/file/rename_variation7.phpt index 5b937728f8..dc5ce429b6 100644 --- a/ext/standard/tests/file/rename_variation7.phpt +++ b/ext/standard/tests/file/rename_variation7.phpt @@ -24,7 +24,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%sthere_is_no_such_file" diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index 7be25949f6..b3a1797c7a 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 6e236c376c..2026a249bc 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 2516e6162e..5a958631d9 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php outputs Permission Denied, p8 outputs no suck file or dir 'single space' => ' ', diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index 04fee0ee2a..0556266efa 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -72,7 +72,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 7b4311c245..2b4f607ade 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource $fileres, ); diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index e6b3eaabb6..2418ccfd5f 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -29,36 +29,36 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir - $unixifiedDir, - + $unixifiedDir, + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index 5848007395..fd700a0062 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test rmdir() function : variation: various valid and invalid paths +Test rmdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -22,33 +22,33 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/stat_basic-win32-mb.phpt b/ext/standard/tests/file/stat_basic-win32-mb.phpt index 334eb9ea65..c5f4e6c7ab 100644 --- a/ext/standard/tests/file/stat_basic-win32-mb.phpt +++ b/ext/standard/tests/file/stat_basic-win32-mb.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt index e3e7ea7eb5..cde62730bd 100644 --- a/ext/standard/tests/file/stat_basic-win32.phpt +++ b/ext/standard/tests/file/stat_basic-win32.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt index 1b69da8bf5..3614ba5f7e 100644 --- a/ext/standard/tests/file/stat_error-win32.phpt +++ b/ext/standard/tests/file/stat_error-win32.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Gives information about a file */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); $arr = array(__FILE__); echo "\n*** Testing stat() for error conditions ***\n"; diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index dcba28698f..0c91b2afbc 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index abbc88f945..e3be517cfa 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/statpage.phpt b/ext/standard/tests/file/statpage.phpt index f11be9734c..5bd4183c21 100644 --- a/ext/standard/tests/file/statpage.phpt +++ b/ext/standard/tests/file/statpage.phpt @@ -11,7 +11,7 @@ var_dump(getmygid()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index eece30a2f5..6e692c554a 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -10,7 +10,7 @@ var_dump(fopen("file://".__FILE__, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt index e982f704c4..b18dd85b31 100644 --- a/ext/standard/tests/file/stream_002.phpt +++ b/ext/standard/tests/file/stream_002.phpt @@ -20,7 +20,7 @@ var_dump($a, $b); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_socket_client(): unable to connect to (Failed to parse address "") in %s on line %d bool(false) int(0) diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt index 716ae1f462..1cc57b7f6d 100644 --- a/ext/standard/tests/file/stream_copy_to_stream.phpt +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt @@ -111,7 +111,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) string(0) "" int(%d) diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index b62f19cd37..87e519de88 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -14,7 +14,7 @@ foreach($streams as $stream) echo "===$stream===\n"; $fp = fopen($stream, 'rb'); - + var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:4,S===\n"; diff --git a/ext/standard/tests/file/stream_supports_lock.phpt b/ext/standard/tests/file/stream_supports_lock.phpt index bbf3993b6b..38a84dd7c2 100644 --- a/ext/standard/tests/file/stream_supports_lock.phpt +++ b/ext/standard/tests/file/stream_supports_lock.phpt @@ -30,7 +30,7 @@ var_dump(stream_supports_lock($sock)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt index 489c26644f..228e459297 100644 --- a/ext/standard/tests/file/symlink.phpt +++ b/ext/standard/tests/file/symlink.phpt @@ -44,7 +44,7 @@ var_dump(linkinfo(".")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) string(%d) "%ssymlink.dat" int(%d) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt index 416e6ae323..09fb35c973 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt @@ -50,7 +50,7 @@ $files = array ( ); $counter = 1; -/* create soft/hard link to the file +/* create soft/hard link to the file and check linkinfo() and is_link() on the link created */ foreach($files as $file) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt index b1b1afc740..12e5da17e8 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt @@ -23,7 +23,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Variation 1 : Creating links across directories where linkname is stored as an object and array member */ -// creating temp directory which will contain temp file and links created +// creating temp directory which will contain temp file and links created $file_path = dirname(__FILE__); $dirname = "$file_path/symlink_link_linkinfo_is_link_variation1/test/home"; mkdir($dirname, 0777, true); @@ -58,11 +58,11 @@ clearstatcache(); /* Testing on hard links */ echo "\n-- Working with hard links --\n"; // creating hard link -var_dump( link($filename, $obj->linkname) ); +var_dump( link($filename, $obj->linkname) ); // check if the link exists var_dump( linkinfo($obj->linkname) ); // check if link is soft link; expected: false as the link is a hardlink -var_dump( is_link($obj->linkname) ); +var_dump( is_link($obj->linkname) ); // delete the link created unlink($obj->linkname); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index 21c9b57654..cbe4785ed0 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 3 : Create file and a soft link to the file - Access data of the file through the soft link + Access data of the file through the soft link Update the file through soft link Check size of file and soft link link */ diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index f58937cd12..9d57c41f7e 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 4 : Create file and a hard link to the file - Access data of the file through the hard link + Access data of the file through the hard link Update the file through hard link Check size of file and hard link */ @@ -45,7 +45,7 @@ $data_from_link = file_get_contents($linkname); // data read from $filename var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -61,7 +61,7 @@ $data_from_file = file_get_contents($filename); var_dump( $data_from_file ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -79,7 +79,7 @@ var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; var_dump( filesize($filename) ); var_dump( filesize($linkname) ); -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt index 9b9afba10d..fe4f40a2b2 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt @@ -54,7 +54,7 @@ echo "\n-- Working with soft links --\n"; $linkname = "$dirname/non_existent_link_variation5.tmp"; // expected: false -var_dump( symlink($filename, $linkname) ); // this link won't get created +var_dump( symlink($filename, $linkname) ); // this link won't get created var_dump( linkinfo($linkname) ); var_dump( is_link($linkname) ); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt index 82ca75b64d..df63dcfc5d 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt @@ -33,7 +33,7 @@ $linkname = "$dir/symlink_link_linkinfo_is_link_link_variation7.tmp"; $dirname = "$dir/home/test"; mkdir($dirname, 0755, true); -// create file +// create file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt index aacbcd4b3f..8a771b27b9 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt @@ -21,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Description: Gets information about a link */ -/* Variation 9 : Check lstat of soft/hard link created +/* Variation 9 : Check lstat of soft/hard link created Check linkinfo() value with lstat['dev'] */ // temp file used @@ -34,7 +34,7 @@ $soft_link = "$dirname/symlink_link_linkinfo_is_link_softlink_variation9.tmp"; // hard link name used $hard_link = "$dirname/symlink_link_linkinfo_is_link_hardlink_variation9.tmp"; -// create the file +// create the file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt index 4d985410da..3e659c092c 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt index a3dd7e9d62..a571a7cd5b 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index 0745f5397c..dbdc396656 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -21,12 +21,12 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; @@ -35,10 +35,10 @@ for($i=1; $i<=10; $i++) { echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; - + echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } diff --git a/ext/standard/tests/file/tempnam_variation2-win32.phpt b/ext/standard/tests/file/tempnam_variation2-win32.phpt index 15d59614ff..60fe951353 100644 --- a/ext/standard/tests/file/tempnam_variation2-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation2-win32.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,27 +57,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation2.phpt b/ext/standard/tests/file/tempnam_variation2.phpt index 1a2de1885b..dd98b40e8b 100644 --- a/ext/standard/tests/file/tempnam_variation2.phpt +++ b/ext/standard/tests/file/tempnam_variation2.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,11 +57,11 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } @@ -70,14 +70,14 @@ for($i = 0; $i<count($dir_paths); $i++) { } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt index e96846ff2c..47da53df01 100644 --- a/ext/standard/tests/file/tempnam_variation4-0.phpt +++ b/ext/standard/tests/file/tempnam_variation4-0.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0000 to 0350, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ @@ -44,9 +44,9 @@ for($mode = 0000; $mode <= 0350; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt index 667d3ecda6..39f1fb0053 100644 --- a/ext/standard/tests/file/tempnam_variation4-1.phpt +++ b/ext/standard/tests/file/tempnam_variation4-1.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0351 to 0777, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ @@ -44,9 +44,9 @@ for($mode = 0351; $mode <= 0777; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation5-win32.phpt b/ext/standard/tests/file/tempnam_variation5-win32.phpt index 3e39352fe1..d2e708bc30 100644 --- a/ext/standard/tests/file/tempnam_variation5-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation5-win32.phpt @@ -25,7 +25,7 @@ $h = fopen($dir_name."/tempnam_variation6.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation6.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt index cf2eff8bec..fdfcee9bed 100644 --- a/ext/standard/tests/file/tempnam_variation5.phpt +++ b/ext/standard/tests/file/tempnam_variation5.phpt @@ -23,7 +23,7 @@ $h = fopen($dir_name."/tempnam_variation5.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation5.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation6-win32.phpt b/ext/standard/tests/file/tempnam_variation6-win32.phpt index efe7e86e85..acaa1abf50 100644 --- a/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation6-win32.phpt @@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows Only"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -27,10 +27,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -39,7 +39,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation6.phpt b/ext/standard/tests/file/tempnam_variation6.phpt index 5eb6e6fc86..08a9fce4de 100644 --- a/ext/standard/tests/file/tempnam_variation6.phpt +++ b/ext/standard/tests/file/tempnam_variation6.phpt @@ -4,7 +4,7 @@ Test tempnam() function: usage variations - Using previous unique filename <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Do not run on Windows"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -25,10 +25,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -37,7 +37,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 918ef36588..40999fef47 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) != "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ - + echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index d24c1d8974..4a5ffcd332 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); @@ -46,22 +46,22 @@ for( $i=0; $i<count($names_arr); $i++ ) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } else { echo "unknown location\n"; - } - + } + } - else { + else { echo "-- File is not created --\n"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation8-win32.phpt b/ext/standard/tests/file/tempnam_variation8-win32.phpt index 52ff7b9daa..cceda6438f 100644 --- a/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation8-win32.phpt @@ -32,21 +32,21 @@ $dir_paths = array( "$dir_path\\..\\..\\.\\tempnam_variation2", "$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2", "$dir_path\\BADDIR", - - + + // relative paths "tempname_variation2\\", "tempnam_variation2\\tempnam_variation2_sub", - "tempnam_variation2\\\\tempnam_variation2_sub", + "tempnam_variation2\\\\tempnam_variation2_sub", ".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -56,27 +56,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt index c6c270d065..fa000db008 100644 --- a/ext/standard/tests/file/touch.phpt +++ b/ext/standard/tests/file/touch.phpt @@ -38,7 +38,7 @@ var_dump(touch("/no/such/file/or/directory")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL bool(true) diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index d721edc84c..9a87ac60a6 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt index b4ad29f037..ff0b9d944b 100644 --- a/ext/standard/tests/file/touch_basic-win32.phpt +++ b/ext/standard/tests/file/touch_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt index b39c84b7e0..a4c319aefa 100644 --- a/ext/standard/tests/file/touch_basic.phpt +++ b/ext/standard/tests/file/touch_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_error.phpt b/ext/standard/tests/file/touch_error.phpt index ec58fee511..9fa8a81739 100644 --- a/ext/standard/tests/file/touch_error.phpt +++ b/ext/standard/tests/file/touch_error.phpt @@ -10,7 +10,7 @@ var_dump(touch(1, 2, 3, 4)); var_dump(touch("/no/such/file/or/directory")); ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index dba41a6077..688da7ef89 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt index 9477a3494e..a3596adc6b 100644 --- a/ext/standard/tests/file/touch_variation2.phpt +++ b/ext/standard/tests/file/touch_variation2.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) string(6) "mydata" Done diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index 445ef3fb1c..37beb13160 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt index d6760f92b7..8aae6a0964 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt index 1ba1fc44cb..261d95ac94 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt index 0b12173cc1..2e96b73de2 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt index 0bbb4a7a3b..a55714565b 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 92bd8b7b5b..2d428405e9 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,38 +26,38 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index a448db3ea4..4c704ccaca 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,38 +26,38 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index 625e571950..a53dbe4e0d 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -29,41 +29,41 @@ $paths = array( $workDir.'\\'.$subDirOrFile, '.\\'.$workDir.'\\'.$subDirOrFile, $workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'\\..\\BADDIR\\'.$subDirOrFile, 'BADDIR\\'.$subDirOrFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\.\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'\\BADDIR\\'.$subDirOrFile, - + //trailing separators $workDir.'\\'.$subDirOrFile.'\\', $cwd.'\\'.$workDir.'\\'.$subDirOrFile.'\\', - + // multiple separators $workDir.'\\\\'.$subDirOrFile, $cwd.'\\\\'.$workDir.'\\\\'.$subDirOrFile, - + // Unixified Dir Or File - $unixifiedDirOrFile, - + $unixifiedDirOrFile, + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -74,7 +74,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -121,7 +121,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -129,12 +129,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt index 29fe92e556..fdcc27ceb9 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -28,7 +28,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt index 85b1a67f53..4feb42137f 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -28,7 +28,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index e0c92caeba..cfe0eb8562 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,18 +31,18 @@ $dirs = array( $workDir.'/'.$tmpDir, './'.$workDir.'/'.$tmpDir, $workDir.'/../'.$workDir.'/'.$tmpDir, - + //absolute $cwd.'/'.$workDir.'/'.$tmpDir, $cwd.'/./'.$workDir.'/'.$tmpDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir, - + // multiple separators $workDir.'//'.$tmpDir, $cwd.'//'.$workDir.'//'.$tmpDir, - + ); - + foreach($dirs as $dirToUnlink) { test_link($workDir.'/'.$tmpDir, $dirToLinkTo, $dirToUnlink, true); //soft link @@ -61,9 +61,9 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedDir); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (is_link($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index ede9ada092..3eab968348 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test unlink() function : variation +Test unlink() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation: contexts and relative files ***\n"; @@ -30,7 +30,7 @@ function f_exists($file) { else { echo "$file doesn't exist\n"; } -} +} ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt index 64a2607d5f..ce0b5f77f3 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : usage variation different types for context ***\n"; @@ -101,7 +101,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes ); diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 8c9fbd895c..9ee6b49d2a 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -29,29 +29,29 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); @@ -61,7 +61,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index e142763cef..ab074c7849 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,34 +31,34 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, true); //soft link - test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link + test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link } unlink($fileToLinkTo); @@ -66,7 +66,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { @@ -88,9 +88,9 @@ function test_link($linkedfile, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedfile); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 0eaed2e4ca..2331c9edc8 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -30,38 +30,38 @@ $files = array( $workDir.'\\'.$tmpFile, '.\\'.$workDir.'\\'.$tmpFile, $workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$tmpFile, 'BADDIR\\'.$tmpFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$tmpFile, $cwd.'\\.\\'.$workDir.'\\'.$tmpFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$tmpFile, - + //trailing separators $workDir.'\\'.$tmpFile.'\\', $cwd.'\\'.$workDir.'\\'.$tmpFile.'\\', - + // multiple separators $workDir.'\\\\'.$tmpFile, $cwd.'\\\\'.$workDir.'\\\\'.$tmpFile, - + // Unixified File - $unixifiedFile, - + $unixifiedFile, + ); - + foreach($files as $fileToUnlink) { $file = $workDir.'/'.$tmpFile; $tounlink = $fileToUnlink; touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt index 2246b5d8a4..04eefc767d 100644 --- a/ext/standard/tests/file/userfilters.phpt +++ b/ext/standard/tests/file/userfilters.phpt @@ -10,7 +10,7 @@ class testfilter extends php_user_filter { $consumed += strlen($bucket->data); stream_bucket_append($out, $bucket); } - return PSFS_PASS_ON; + return PSFS_PASS_ON; } function oncreate() { diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index d39898bbe2..1ff80ac626 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -76,11 +76,11 @@ $DATALEN = strlen($DATA); if ($n != $DATALEN) die("tmpfile stored $n bytes; should be $DATALEN!"); -class uselessstream +class uselessstream { } -class mystream +class mystream { public $path; public $mode; @@ -102,7 +102,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } @@ -228,7 +228,7 @@ for ($i = 0; $i < 256; $i++) { $seeks[] = array($whence, $offset, $position); } -/* we compare the results of fgets using differing line lengths to +/* we compare the results of fgets using differing line lengths to * test the fgets layer also */ $line_lengths = array(1024, 256, 64, 16); $fail_count = 0; @@ -266,7 +266,7 @@ foreach($line_lengths as $line_length) { var_dump($dat); break; } - + $j++; } if ($fail_count) diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt index 4454ee1173..20e10f5c5b 100644 --- a/ext/standard/tests/file/windows_acls/bug44859.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_writable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt index 514953f42e..583e63a2a6 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt b/ext/standard/tests/file/windows_acls/bug44859_3.phpt index ed57abba07..35db1f29be 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_executable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt index bf640fa660..452581fa05 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt @@ -3,7 +3,7 @@ bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --CREDITS-- Venkat Raman Don --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt index d5b184158e..b1bc415f05 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt @@ -27,7 +27,7 @@ foreach ($paths as $d) { } $myDirectory = opendir($prefix); -while($entryName = readdir($myDirectory)) { +while($entryName = readdir($myDirectory)) { echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n"; } closedir($myDirectory); diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt index 784cffadb7..6d9367f857 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt @@ -36,7 +36,7 @@ var_dump(unlink($fnw)); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index 2d74bfc8b3..418c35cd25 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -29,7 +29,7 @@ if ($return_code != true) die("Failed to open file: " . $return_code); $return_code = $zipfile->addfile($testfile_zip, basename($testfile_zip)); if ($return_code != true) print("Failed to add file: " . $zipfile->getStatusString()); - + $return_code = $zipfile->close(); if ($return_code != true) die("Failed to close archive: " . $zipfile->getStatusString()); diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index e291dd0855..6517cf88c1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 path +Test fopen() for reading big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index 74202fa966..98d4e0c89b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 path +Test mkdir/rmdir big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 3be40bf61e..406b925555 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index 3002b50c22..54710fc3c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 to UTF-8 path +Test fopen() for reading big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index abf3a76cc2..4e1ef94c00 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 to UTF-8 path +Test mkdir/rmdir big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index f204790e8e..3b3b8a558a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index 7a6496a619..a5dea1c9b8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index bd4421e7a2..ae7eff4a13 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 488343d8d1..45531b6d6b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index 84b05b71d9..c70570b2b0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index 3759daa71d..a7df51695f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 7e1998ba2a..75e5c55ca9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 7dfd7eadbf..485ff119ef 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 path +Test fopen() for reading CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index 3abce0d0d5..db0c9a690c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 path +Test mkdir/rmdir CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 2a3b7390b1..7dd32c5a90 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 path +Test fopen() for write CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 13395d1017..14b5176415 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 to UTF-8 path +Test fopen() for reading CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index 193e2fdc74..7b5f71b84e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 to UTF-8 path +Test mkdir/rmdir CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index e552464214..84ecdbff9e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 to UTF-8 path +Test fopen() for write CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index b638eb4822..2510a2d2de 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index e44849b061..3b55e18c67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index c0b685c55b..98e5852b67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 85a1c41f07..6fe0d968f7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -19,9 +19,9 @@ internal_encoding=cp1252 #vim: set encoding=cp1252 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "gef"; +$item = "gef"; $prefix = create_data("file", $item, 1252); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -34,7 +34,7 @@ remove_data("file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\gef" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index bdb1a7a878..ef5dc9397d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "hallo " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index 059ab8dd8f..2a34746183 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index 9ea2485eeb..293824d550 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index cae3426e75..c5e075a944 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(4) "hola" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index cacaf5d36d..969a115392 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index 3ac634134a..6119213289 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 12ae1ac7cd..24beb0d31a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 path +Test fopen() for reading cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 9049a65ee1..854910bc31 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 path +Test mkdir/rmdir cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 4c39fb5bda..79892e8ae4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 0fbc78fc12..950c4784d8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 to UTF-8 path +Test fopen() for reading cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index ddc79b1204..25aeb513ba 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 to UTF-8 path +Test mkdir/rmdir cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index 6e28c89e0c..bd8fc22ba3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1253 to UTF-8 path +Test fopen() for write cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 5fbcb74602..4f160c1370 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 path +Test fopen() for reading cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 314f78ecb8..5a72058097 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index d2a04d905a..21f87c501a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 path +Test fopen() for write cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index 13357217c8..7fcb0ff66d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -19,7 +19,7 @@ default_charset=cp1254 #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "okbaytl ileri"; @@ -35,7 +35,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\okbaytl ileri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index 9a92099cd0..7a3d496f9f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 to UTF-8 path +Test fopen() for reading cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 551a0f2235..0cb73207e8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index 12df56b11e..ea4950974c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 to UTF-8 path +Test fopen() for write cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index cbaba44e4e..0c330ea445 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -16,7 +16,7 @@ skip_if_no_required_exts(); #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlı işleri"; @@ -32,7 +32,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlı işleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index 8a685b68c4..01b4f7732d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 path +Test fopen() for reading cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 391a282a69..991d2ab615 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 path +Test mkdir/rmdir cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index 2f38398bb5..276af84a91 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 path +Test fopen() for write cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index 31a48dbc0c..e33616ddd3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 to UTF-8 path +Test fopen() for reading cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index b6a59e4be3..b241210faa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 to UTF-8 path +Test mkdir/rmdir cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 53f83b3a0e..10fef62404 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 to UTF-8 path +Test fopen() for write cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 6b473abb54..617ebedddd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index 1a4233f2c2..341c0c01a2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index 5c25d60fc8..e8cf5709a7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index b021df7fa4..32596c2bd5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index 2fb10a97a5..fd0204aace 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index ba70e1a77e..ef0229a2e9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt index 52f080e2c2..efc43f3513 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt @@ -47,7 +47,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %s跴ͺ1.txt string(%d) "跴ͺ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index 6cb2fb7eee..aa877d7406 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -19,10 +19,10 @@ internal_encoding=cp874 #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "跴ͺ11"; +$item = "跴ͺ11"; $prefix = create_data("file_cp874", $item, 874); $fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item; @@ -35,7 +35,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\跴ͺ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt index 8d32f88a8c..2c244997b6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt @@ -44,7 +44,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sเป็นแฟ้มที่ทดสอบ1.txt string(%d) "เป็นแฟ้มที่ทดสอบ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 843c66f4a2..13ec027748 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "เป็นแฟ้มที่ทดสอบ11"; +$item = "เป็นแฟ้มที่ทดสอบ11"; $prefix = create_data("file_cp874", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\เป็นแฟ้มที่ทดสอบ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 1835f0d360..48e55981ca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 path +Test fopen() for reading cp932 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index f7f24c045d..b177e2d1e2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index d529f6a484..595f86213a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index db31c1ad7a..95992ae79f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -19,7 +19,7 @@ internal_encoding=cp932 #vim: set encoding=cp932 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "eXg}`oCgEpX77"; // cp932 string @@ -35,7 +35,7 @@ remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\eXg}`oCgEpX77" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index a04c14d276..5e0e67b662 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 to UTF-8 path +Test fopen() for reading cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 9b13922a7a..2092e40da0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp932 to UTF-8 path +Test mkdir/rmdir cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index fbe290468c..bd9b1791ea 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp932 to UTF-8 path +Test fopen() for write cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index bcaa31353f..46db0ebc4b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 path +Test fopen() for reading cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index 9edb6d1301..9eb1f08217 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 path +Test mkdir/rmdir cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index 2c05c313e9..eedee97bd0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 path +Test fopen() for write cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index 554a05d94c..b0b709c0cc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 to UTF-8 path +Test fopen() for reading cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 79bdfa4283..2c4b2876c5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 to UTF-8 path +Test mkdir/rmdir cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index 22b64c31f9..b260b7b37f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 to UTF-8 path +Test fopen() for write cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 0ff640aa35..4b2bae974f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading eucjp to UTF-8 path +Test fopen() for reading eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index 5a481e8d12..db3f1d861b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir eucjp to UTF-8 path +Test mkdir/rmdir eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 50727a9d71..0d06fb2489 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write eucjp to UTF-8 path +Test fopen() for write eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index 32b6f9b066..51f1bb945b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading Kartuli UTF-8 path +Test fopen() for reading Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index a92e7c34ed..ff32d75869 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir Kartuli UTF-8 path +Test mkdir/rmdir Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index edfb279cd2..192072760c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write Kartuli UTF-8 path +Test fopen() for write Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 46077258d1..8f08357792 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "ქართველები55"; +$item = "ქართველები55"; $prefix = create_data("file_kartuli", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ქართველები55" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt index 6bc28110e0..688fc6caca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt @@ -12,14 +12,14 @@ skip_if_no_required_exts("mbstring"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt index 94518e7a65..b2af71aa76 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt @@ -11,7 +11,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt index 3be1850c5a..bcae2c53bc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt @@ -11,7 +11,7 @@ skip_if_no_required_exts("mbstring"); ?> --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('x', 50) . "ü"; $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} /* path doesn't exist at this point! */ $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt index 2453538190..5cc697c0fc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt @@ -1,5 +1,5 @@ --TEST-- -Mkdir with path length < 260 and > 248 has be a long path +Mkdir with path length < 260 and > 248 has be a long path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -15,13 +15,13 @@ if (strlen($start) > 260 || strlen($start) > 248) { --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s\\"; -} +} $start = realpath(dirname(__FILE__)); if (strlen($start) <= 248) { |