felipe Thu, 09 Jun 2011 00:23:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311956
Log:
- Missing fixes for grammar fix 's/valid path/a valid path/'
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_API.c
U php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
U php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt
U php/php-src/trunk/Zend/zend_API.c
U php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt
U php/php-src/trunk/ext/phar/tests/opendir_edgecases.phpt
U php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt
U php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt
U php/php-src/trunk/ext/standard/tests/file/007_error.phpt
U php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt
U php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt
U php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt
U php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt
U php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt
U php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt
U php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt
U php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt
Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_API.c 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.c 2011-06-09 00:23:43 UTC (rev 311956)
@@ -449,7 +449,7 @@
case IS_ARRAY:
case IS_RESOURCE:
default:
- return c == 's' ? "string" : "valid path";
+ return c == 's' ? "string" : "a valid path";
}
}
break;
Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -36,7 +36,7 @@
<?php rmdir(dirname(__FILE__) . '/poo'); ?>
<?php unlink(dirname(__FILE__) . '/foob'); ?>
--EXPECTF--
-Warning: fopen() expects parameter 1 to be string, array given in %sfopen_edgecases2.php on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_edgecases2.php on line %d
blah
test
Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -52,10 +52,10 @@
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(dirname(__FILE__) . '/poo');
--EXPECTF--
-Warning: opendir() expects parameter 1 to be %string, array given in %sopendir_edgecases.php on line %d
+Warning: opendir() expects parameter 1 to be a valid path, array given in %sopendir_edgecases.php on line %d
.
..
foo
Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d
-===DONE===
\ No newline at end of file
+===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -201,7 +201,7 @@
-- Iteration 18 --
-Warning: chdir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, array given in %s on line %d
bool(false)
-- Iteration 19 --
@@ -230,6 +230,6 @@
-- Iteration 25 --
-Warning: chdir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, resource given in %s on line %d
bool(false)
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -205,7 +205,7 @@
-- Iteration 18 --
-Warning: scandir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
-- Iteration 19 --
@@ -248,6 +248,6 @@
-- Iteration 25 --
-Warning: scandir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -145,7 +145,7 @@
bool(false)
-- Iteration 5 --
-Warning: fopen() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %s on line %d
bool(false)
Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@
bool(false)
-- Iteration 6 --
-Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, object given in %s on line %d
bool(false)
Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -143,19 +143,19 @@
bool(false)
--empty array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--associative array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--uppercase NULL--
@@ -195,7 +195,7 @@
bool(false)
--instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, object given, %s(%d)
NULL
--undefined var--
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -58,7 +58,7 @@
bool(false)
bool(false)
-Warning: filegroup() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: filegroup(): stat failed for 1234 in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -59,7 +59,7 @@
bool(false)
bool(false)
-Warning: fileinode() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileinode(): stat failed for 1234 in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -59,7 +59,7 @@
bool(false)
bool(false)
-Warning: fileowner() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileowner(): stat failed for 1234 in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -58,7 +58,7 @@
bool(false)
bool(false)
-Warning: fileperms() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileperms(): stat failed for 1234 in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -42,7 +42,7 @@
bool(false)
bool(false)
-Warning: is_dir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -62,7 +62,7 @@
bool(false)
bool(false)
-Warning: is_executable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
Done
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -45,7 +45,7 @@
NULL
bool(false)
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
*** Done ***
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -51,7 +51,7 @@
bool(false)
bool(false)
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -61,7 +61,7 @@
bool(false)
bool(false)
-Warning: is_readable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
Done
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -67,10 +67,10 @@
bool(false)
bool(false)
-Warning: is_writable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
-Warning: is_writeable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -67,10 +67,10 @@
Warning: lchown(): No such file or directory in %s on line %d
bool(false)
-Warning: lchown() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, object given in %s on line %d
bool(true)
-Warning: lchown() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, array given in %s on line %d
bool(true)
Warning: lchown(): Operation not permitted in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -51,7 +51,7 @@
Warning: lstat(): Lstat failed for 22 in %s on line %d
bool(false)
-Warning: lstat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lstat() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
*** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@
Warning: stat(): stat failed for 22 in %s on line %d
bool(false)
-Warning: stat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: stat() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
Done
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -145,19 +145,19 @@
bool(false)
--empty array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -197,7 +197,7 @@
bool(false)
--instance of classWithoutToString--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, object given, %s(%d)
bool(false)
--undefined var--
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/Zend/zend_API.c 2011-06-09 00:23:43 UTC (rev 311956)
@@ -449,7 +449,7 @@
case IS_ARRAY:
case IS_RESOURCE:
default:
- return c == 's' ? "string" : "valid path";
+ return c == 's' ? "string" : "a valid path";
}
}
break;
Modified: php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -36,7 +36,7 @@
<?php rmdir(dirname(__FILE__) . '/poo'); ?>
<?php unlink(dirname(__FILE__) . '/foob'); ?>
--EXPECTF--
-Warning: fopen() expects parameter 1 to be string, array given in %sfopen_edgecases2.php on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_edgecases2.php on line %d
blah
test
Modified: php/php-src/trunk/ext/phar/tests/opendir_edgecases.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/opendir_edgecases.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/phar/tests/opendir_edgecases.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -52,10 +52,10 @@
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(dirname(__FILE__) . '/poo');
--EXPECTF--
-Warning: opendir() expects parameter 1 to be %string, array given in %sopendir_edgecases.php on line %d
+Warning: opendir() expects parameter 1 to be a valid path, array given in %sopendir_edgecases.php on line %d
.
..
foo
Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d
-===DONE===
\ No newline at end of file
+===DONE===
Modified: php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -201,7 +201,7 @@
-- Iteration 18 --
-Warning: chdir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, array given in %s on line %d
bool(false)
-- Iteration 19 --
@@ -230,6 +230,6 @@
-- Iteration 25 --
-Warning: chdir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be a valid path, resource given in %s on line %d
bool(false)
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -205,7 +205,7 @@
-- Iteration 18 --
-Warning: scandir() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
-- Iteration 19 --
@@ -248,6 +248,6 @@
-- Iteration 25 --
-Warning: scandir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: scandir() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/file/007_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/007_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/007_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -145,7 +145,7 @@
bool(false)
-- Iteration 5 --
-Warning: fopen() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, array given in %s on line %d
bool(false)
Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@
bool(false)
-- Iteration 6 --
-Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be a valid path, object given in %s on line %d
bool(false)
Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -143,19 +143,19 @@
bool(false)
--empty array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--associative array--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--uppercase NULL--
@@ -195,7 +195,7 @@
bool(false)
--instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be a valid path, object given, %s(%d)
NULL
--undefined var--
Modified: php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -58,7 +58,7 @@
bool(false)
bool(false)
-Warning: filegroup() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: filegroup(): stat failed for 1234 in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -59,7 +59,7 @@
bool(false)
bool(false)
-Warning: fileinode() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileinode(): stat failed for 1234 in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -59,7 +59,7 @@
bool(false)
bool(false)
-Warning: fileowner() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileowner(): stat failed for 1234 in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -58,7 +58,7 @@
bool(false)
bool(false)
-Warning: fileperms() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
Warning: fileperms(): stat failed for 1234 in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -42,7 +42,7 @@
bool(false)
bool(false)
-Warning: is_dir() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -62,7 +62,7 @@
bool(false)
bool(false)
-Warning: is_executable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
Done
Modified: php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -45,7 +45,7 @@
NULL
bool(false)
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
*** Done ***
Modified: php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -51,7 +51,7 @@
bool(false)
bool(false)
-Warning: is_file() expects parameter 1 to be valid path, resource given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, resource given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -61,7 +61,7 @@
bool(false)
bool(false)
-Warning: is_readable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
Done
Modified: php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -67,10 +67,10 @@
bool(false)
bool(false)
-Warning: is_writable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
-Warning: is_writeable() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
bool(false)
bool(false)
Modified: php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -67,10 +67,10 @@
Warning: lchown(): No such file or directory in %s on line %d
bool(false)
-Warning: lchown() expects parameter 1 to be valid path, object given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, object given in %s on line %d
bool(true)
-Warning: lchown() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lchown() expects parameter 1 to be a valid path, array given in %s on line %d
bool(true)
Warning: lchown(): Operation not permitted in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -51,7 +51,7 @@
Warning: lstat(): Lstat failed for 22 in %s on line %d
bool(false)
-Warning: lstat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: lstat() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
*** Testing stat() for error conditions ***
@@ -74,6 +74,6 @@
Warning: stat(): stat failed for 22 in %s on line %d
bool(false)
-Warning: stat() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: stat() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
Done
Modified: php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt 2011-06-08 23:30:02 UTC (rev 311955)
+++ php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt 2011-06-09 00:23:43 UTC (rev 311956)
@@ -145,19 +145,19 @@
bool(false)
--empty array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--int indexed array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--associative array--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--nested arrays--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, array given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, array given, %s(%d)
bool(false)
--uppercase NULL--
@@ -197,7 +197,7 @@
bool(false)
--instance of classWithoutToString--
-Error: 2 - parse_ini_file() expects parameter 1 to be valid path, object given, %s(%d)
+Error: 2 - parse_ini_file() expects parameter 1 to be a valid path, object given, %s(%d)
bool(false)
--undefined var--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
