From: Felipe Pena Date: Thu, 9 Jun 2011 00:23:43 +0000 (+0000) Subject: - Missing fixes for grammar fix 's/valid path/a valid path/' X-Git-Tag: php-5.4.0alpha1~69 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a0443f07c90d0326b43f5a0451e6bedadfb7988;p=php - Missing fixes for grammar fix 's/valid path/a valid path/' --- diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 3ae6088786..28ac9e9364 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -449,7 +449,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, const cha case IS_ARRAY: case IS_RESOURCE: default: - return c == 's' ? "string" : "valid path"; + return c == 's' ? "string" : "a valid path"; } } break; diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 6c5ac7b455..872aa289bc 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -36,7 +36,7 @@ include $pname . '/foo/hi'; --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 diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index c0f5ebc067..be899df81b 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -52,10 +52,10 @@ include $pname . '/foo';