cataphract Mon, 22 Nov 2010 05:10:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305635
Log:
- Fix tests for \0 patch in PHP 5.3.
- Fix constants_error_004.phpt (closes bug #51901)
Bug: http://bugs.php.net/51901 (Closed) tests/classes/constants_error_004.phpt
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation4.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/disk_free_space_variation.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation8.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/filegroup_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileinode_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileowner_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileperms_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fnmatch_variation.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/glob_variation.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_dir_variation4.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_executable_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_file_variation4.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_readable_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_writable_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/stream_rfc2397_006.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7.phpt
U php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
U php/php-src/trunk/tests/classes/constants_error_004.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation4.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/copy_variation4.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -2,9 +2,6 @@
Test copy() function: usage variations - destination file names(empty string, nulls & bools)
--SKIPIF--
<?php
-if(substr(PHP_OS, 0, 3) == "WIN")
- die("skip Do not run on Windows");
-
if(substr(PHP_OS, 0, 3) == "AIX")
die("skip Do not run on AIX");
?>
@@ -22,7 +19,7 @@
echo "*** Test copy() function: destination file names with empty string, nulls & bools ***\n";
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation4.tmp";
-$file_handle = fopen($src_file_name, "w");
+$file_handle = fopen($src_file_name, "wb");
fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
fclose($file_handle);
@@ -114,17 +111,13 @@
Warning: unlink(%s): %s
-- Iteration 3 --
-Existence of destination file before copy => bool(true)
-Copy operation =>
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
-bool(false)
-Existence of destination file => bool(true)
-Destination file name => %s/
+Existence of destination file before copy => bool(false)
+Copy operation => bool(false)
+Existence of destination file => bool(false)
+Destination file name => %s/
Size of source file => int(1500)
-Size of destination file => int(%d)
+Size of destination file => bool(false)
-Warning: unlink(%s): %s
-
-- Iteration 4 --
Existence of destination file before copy => bool(true)
Copy operation =>
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/disk_free_space_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/disk_free_space_variation.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/disk_free_space_variation.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -105,19 +105,19 @@
float(%d)
-- Iteration 9 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 10 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 11 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 12 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
--- Done ---
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8-win32.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8-win32.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -76,8 +76,6 @@
bool(false)
-- Filename: \0 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Filename: array() --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_get_contents_variation8.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -68,8 +68,6 @@
Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d
bool(false)
-- Iteration 6 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 7 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation8.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation8.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -70,9 +70,7 @@
-- Iteration 5 --
9 bytes written to:
-- Iteration 6 --
-
-Warning: file_put_contents(): Filename cannot be empty in %s on line %d
-Failed to write data to:
+Failed to write data to:
-- Iteration 7 --
Warning: file_put_contents() expects parameter 1 to be string, array given in %s on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/filegroup_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/filegroup_variation3.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/filegroup_variation3.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -74,8 +74,8 @@
Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileinode_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileinode_variation3.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileinode_variation3.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -75,8 +75,8 @@
Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileowner_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileowner_variation3.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileowner_variation3.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -75,8 +75,8 @@
Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileperms_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileperms_variation3.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fileperms_variation3.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -74,8 +74,8 @@
Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fnmatch_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fnmatch_variation.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fnmatch_variation.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -259,22 +259,22 @@
--- With Strings ---
-- Iteration 0 --
bool(true)
+bool(false)
bool(true)
-bool(true)
bool(false)
bool(false)
bool(true)
-- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
bool(false)
bool(false)
-bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
-- Iteration 2 --
bool(true)
+bool(false)
bool(true)
-bool(true)
bool(false)
bool(false)
bool(true)
@@ -282,9 +282,9 @@
bool(false)
bool(false)
bool(false)
-bool(true)
bool(false)
bool(false)
+bool(false)
-- Iteration 4 --
bool(false)
bool(false)
@@ -294,8 +294,8 @@
bool(false)
-- Iteration 5 --
bool(true)
+bool(false)
bool(true)
-bool(true)
bool(false)
bool(false)
bool(true)
@@ -397,30 +397,30 @@
bool(true)
bool(true)
bool(true)
-bool(true)
bool(false)
bool(false)
+bool(false)
-- Iteration 1 --
bool(true)
bool(true)
bool(true)
-bool(true)
bool(false)
bool(false)
+bool(false)
-- Iteration 2 --
bool(true)
bool(true)
bool(true)
-bool(true)
bool(false)
bool(false)
+bool(false)
-- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-bool(true)
bool(false)
bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
-- Iteration 4 --
bool(false)
bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/glob_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/glob_variation.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/glob_variation.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -325,20 +325,12 @@
}
-- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
- [0]=>
- string(%d) "%s/glob_variation/WONDER5"
-}
-array(0) {
-}
-array(0) {
-}
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
-- Iteration 9 --
array(0) {
@@ -441,8 +433,7 @@
array(0) {
}
-- Iteration 8 --
-array(0) {
-}
+bool(false)
-- Iteration 9 --
array(0) {
}
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_dir_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_dir_variation4.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_dir_variation4.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -77,9 +77,9 @@
bool(false)
-- Iteration 9 --
-bool(true)
+bool(false)
-- Iteration 10 --
-bool(true)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_executable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_executable_variation1.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_executable_variation1.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -76,9 +76,9 @@
-- Iteration 5 --
bool(false)
-- Iteration 6 --
-bool(true)
+bool(false)
-- Iteration 7 --
-bool(true)
+bool(false)
-- Iteration 8 --
bool(false)
-- Iteration 9 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_file_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_file_variation4.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_file_variation4.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -67,8 +67,8 @@
- Iteration 6 -
bool(false)
- Iteration 7 -
-bool(true)
+bool(false)
- Iteration 8 -
-bool(true)
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_readable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_readable_variation1.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_readable_variation1.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -87,11 +87,11 @@
-- Iteration 6 --
bool(false)
-- Iteration 7 --
-bool(true)
+bool(false)
-- Iteration 8 --
-bool(true)
+bool(false)
-- Iteration 9 --
-bool(true)
+bool(false)
-- Iteration 10 --
bool(true)
-- Iteration 11 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_writable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_writable_variation1.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/is_writable_variation1.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -96,14 +96,14 @@
bool(false)
bool(false)
-- Iteration 7 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 8 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 9 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 10 --
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_rmdir_variation2.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/mkdir_rmdir_variation2.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -64,8 +64,8 @@
bool(false)
*** Testing mkdir() and rmdir() for binary safe functionality ***
-bool(true)
-bool(true)
+bool(false)
+bool(false)
*** Testing mkdir() with miscelleneous input ***
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10-win32.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10-win32.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -37,7 +37,7 @@
foreach($names_arr as $key => $value) {
echo "\n-- Filename: $key --\n";
- readfile($value);
+ var_dump(readfile($value));
};
?>
@@ -48,40 +48,48 @@
-- Filename: -1 --
Warning: readfile(-1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: TRUE --
Warning: readfile(1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: FALSE --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: NULL --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: "" --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: " " --
Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
+bool(false)
-- Filename: \0 --
+bool(false)
-Warning: readfile(): Filename cannot be empty in %s on line %d
-
-- Filename: array() --
Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
-- Filename: /no/such/file/dir --
Warning: readfile(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: php/php --
Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
+bool(false)
===Done===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readfile_variation10.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -39,7 +39,7 @@
for( $i=0; $i<count($names_arr); $i++ ) {
$name = $names_arr[$i];
echo "-- testing '$name' --\n";
- readfile($name);
+ var_dump(readfile($name));
}
echo "\n*** Done ***\n";
@@ -49,32 +49,40 @@
-- testing '-1' --
Warning: readfile(-1): failed to open stream: %s in %s on line %d
+bool(false)
-- testing '1' --
Warning: readfile(1): failed to open stream: %s in %s on line %d
+bool(false)
-- testing '' --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- testing '' --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- testing '' --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- testing ' ' --
Warning: readfile( ): failed to open stream: %s in %s on line %d
--- testing ' ' --
-
-Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
+-- testing '
+bool(false)
-- testing 'Array' --
Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
-- testing '%sdir' --
Warning: readfile(%sdir): failed to open stream: %s in %s on line %d
+bool(false)
-- testing '%sphp' --
Warning: readfile(%sphp): failed to open stream: %s in %s on line %d
+bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -106,12 +106,8 @@
Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d
bool(false)
--- 6 testing ' ' string --
-
-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
+-- 6 testing '
bool(false)
-
-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- 7 testing 'Array' array --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -98,11 +98,7 @@
Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
bool(false)
-- testing '%s' --
-
-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-
-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- testing 'Array' --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/stream_rfc2397_006.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/stream_rfc2397_006.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/stream_rfc2397_006.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -21,8 +21,8 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-string(0) ""
-string(6) "foobar"
+bool(false)
+bool(false)
string(13) "foobar foobar"
Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3-win32.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -31,8 +31,8 @@
NULL,
"",
" ",
+ /* Invalid args */
"\0",
- /* Invalid args */
array(),
/* Valid args*/
@@ -102,7 +102,8 @@
Failed, not created in the correct directory %s vs %s
0
-- Iteration 6 --
-OK
+Failed, not created in the correct directory %s vs %s
+0
-- Iteration 7 --
Warning: tempnam() expects parameter 2 to be string, array given in %s\ext\standard\tests\file\tempnam_variation3-win32.php on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation3.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -100,9 +100,9 @@
File permissions are => 100600
File created in => directory specified
-- Iteration 6 --
-File name is => %s/%s
-File permissions are => 100600
-File created in => directory specified
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7-win32.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -89,9 +89,9 @@
File permissions are => 100666
File created in => temp dir
-- Iteration 6 --
-File name is => %s%et%s
-File permissions are => 100666
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/tempnam_variation7.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -94,9 +94,9 @@
File permissions are => 100600
File created in => temp dir
-- Iteration 6 --
-File name is => %s%etempnam_variation3.tmp%s
-File permissions are => 100600
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
Modified: php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -10,4 +10,4 @@
$a = new C();
?>
--EXPECTF--
-Fatal error: Undefined class constant 'D::hello' in %s on line %d
+Fatal error: Class 'D' not found in %s on line %d
Modified: php/php-src/trunk/tests/classes/constants_error_004.phpt
===================================================================
--- php/php-src/trunk/tests/classes/constants_error_004.phpt 2010-11-22 02:33:33 UTC (rev 305634)
+++ php/php-src/trunk/tests/classes/constants_error_004.phpt 2010-11-22 05:10:14 UTC (rev 305635)
@@ -10,4 +10,4 @@
$a = new C();
?>
--EXPECTF--
-Fatal error: Undefined class constant 'D::hello' in %s on line %d
+Fatal error: Class 'D' not found in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
