felipe                                   Wed, 08 Jun 2011 00:53:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311907

Log:
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/oci8/tests/null_byte_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
    U   php/php-src/trunk/Zend/zend_API.c
    U   php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/bug39863.phpt
    U   php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt
    U   
php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt
    U   php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt
    U   php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.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 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.c	2011-06-08 00:53:55 UTC (rev 311907)
@@ -434,14 +434,14 @@
 						*p = Z_STRVAL_PP(arg);
 						*pl = Z_STRLEN_PP(arg);
 						if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-							return "valid path";
+							return "a valid path";
 						}
 						break;

 					case IS_OBJECT:
 						if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) {
 							if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-								return "valid path";
+								return "a valid path";
 							}
 							break;
 						}

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -32,10 +32,10 @@
 --EXPECTF--
 Test 1: Import

-Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 Test 2: Export

-Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 ===DONE===

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug39863.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -17,7 +17,7 @@
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
 PASS
 ===DONE===


Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -106,34 +106,34 @@

 -- Iteration 9 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 11 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 12 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 --- Done ---

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -100,22 +100,22 @@

 -- Iteration 9 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 11 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 12 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 *** Testing with Binary Input ***
 float(64246190080)

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -75,11 +75,11 @@
 bool(false)
 - Iteration 7 -

-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -76,11 +76,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -76,11 +76,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -75,11 +75,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/glob_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -326,22 +326,22 @@

 -- Iteration 8 --

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 9 --
@@ -446,7 +446,7 @@
 }
 -- Iteration 8 --

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --
 array(0) {

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -78,12 +78,12 @@

 -- Iteration 9 --

-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -77,11 +77,11 @@
 bool(false)
 -- Iteration 6 --

-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 7 --

-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --
 bool(false)

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation4.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -68,11 +68,11 @@
 bool(false)
 - Iteration 7 -

-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -88,15 +88,15 @@
 bool(false)
 -- Iteration 7 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -97,24 +97,24 @@
 bool(false)
 -- Iteration 7 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -95,13 +95,13 @@
 File created in => temp dir
 -- Iteration 6 --

-Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
 -- File is not created --

 Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 7 --

-Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
 -- File is not created --

 Warning: unlink(): Invalid argument in %s on line %d

Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/Zend/zend_API.c	2011-06-08 00:53:55 UTC (rev 311907)
@@ -434,14 +434,14 @@
 						*p = Z_STRVAL_PP(arg);
 						*pl = Z_STRLEN_PP(arg);
 						if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-							return "valid path";
+							return "a valid path";
 						}
 						break;

 					case IS_OBJECT:
 						if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) {
 							if (c == 'p' && CHECK_ZVAL_NULL_PATH(*arg)) {
-								return "valid path";
+								return "a valid path";
 							}
 							break;
 						}

Modified: php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -33,10 +33,10 @@
 --EXPECTF--
 Test 1: Import

-Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 Test 2: Export

-Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 ===DONE===

Modified: php/php-src/trunk/ext/standard/tests/file/bug39863.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/bug39863.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/bug39863.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -17,7 +17,7 @@
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
 PASS
 ===DONE===


Modified: php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/disk_free_space_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -106,34 +106,34 @@

 -- Iteration 9 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 11 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 12 --

-Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_free_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: diskfreespace() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 --- Done ---

Modified: php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/disk_total_space_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -100,22 +100,22 @@

 -- Iteration 9 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 11 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 12 --

-Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: disk_total_space() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 *** Testing with Binary Input ***
 float(64246190080)

Modified: php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/filegroup_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -75,11 +75,11 @@
 bool(false)
 - Iteration 7 -

-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: filegroup() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/fileinode_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -76,11 +76,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileinode() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/fileowner_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -76,11 +76,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileowner() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/fileperms_variation3.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -75,11 +75,11 @@
 bool(false)
 - Iteration 7 -

-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: fileperms() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/glob_variation.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -326,22 +326,22 @@

 -- Iteration 8 --

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 9 --
@@ -446,7 +446,7 @@
 }
 -- Iteration 8 --

-Warning: glob() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: glob() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --
 array(0) {

Modified: php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/is_dir_variation4.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -78,12 +78,12 @@

 -- Iteration 9 --

-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 -- Iteration 10 --

-Warning: is_dir() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_dir() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/is_executable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -77,11 +77,11 @@
 bool(false)
 -- Iteration 6 --

-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 7 --

-Warning: is_executable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_executable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --
 bool(false)

Modified: php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/is_file_variation4.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -68,11 +68,11 @@
 bool(false)
 - Iteration 7 -

-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 - Iteration 8 -

-Warning: is_file() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_file() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/is_readable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -88,15 +88,15 @@
 bool(false)
 -- Iteration 7 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --

-Warning: is_readable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_readable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

Modified: php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/is_writable_variation1.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -97,24 +97,24 @@
 bool(false)
 -- Iteration 7 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 8 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 9 --

-Warning: is_writable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL

-Warning: is_writeable() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: is_writeable() expects parameter 1 to be a valid path, string given in %s on line %d
 NULL
 -- Iteration 10 --
 bool(true)

Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-08 00:23:02 UTC (rev 311906)
+++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt	2011-06-08 00:53:55 UTC (rev 311907)
@@ -95,13 +95,13 @@
 File created in => temp dir
 -- Iteration 6 --

-Warning: tempnam() expects parameter 1 to be valid path, string given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
 -- File is not created --

 Warning: unlink(): Invalid argument in %s on line %d
 -- Iteration 7 --

-Warning: tempnam() expects parameter 1 to be valid path, array given in %s on line %d
+Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
 -- File is not created --

 Warning: unlink(): Invalid argument in %s on line %d
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to