diff options
| -rw-r--r-- | ext/phar/tests/cache_list/frontcontroller21.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/frontcontroller21.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/tar/frontcontroller21.phar.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/zip/frontcontroller21.phar.phpt | 3 | ||||
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/spl_caching_iterator_constructor_flags.phpt | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt index 829f2986e9..0b5953acf0 100644 --- a/ext/phar/tests/cache_list/frontcontroller21.phpt +++ b/ext/phar/tests/cache_list/frontcontroller21.phpt @@ -3,6 +3,7 @@ Phar front controller $_SERVER munging success [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller21.php +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -22,4 +23,4 @@ string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" string(22) "/frontcontroller21.php" string(%d) "%sfrontcontroller21.php" -string(40) "/frontcontroller21.php/index.php?test=hi"
\ No newline at end of file +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt index bf50c6e801..6520abecae 100644 --- a/ext/phar/tests/frontcontroller21.phpt +++ b/ext/phar/tests/frontcontroller21.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -21,4 +22,4 @@ string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" string(22) "/frontcontroller21.php" string(%d) "%sfrontcontroller21.php" -string(40) "/frontcontroller21.php/index.php?test=hi"
\ No newline at end of file +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt index bb93996d69..31bb61edab 100644 --- a/ext/phar/tests/tar/frontcontroller21.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success tar-based --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -21,4 +22,4 @@ string(18) "/index.php?test=hi" string(37) "/frontcontroller21.phar.php/index.php" string(27) "/frontcontroller21.phar.php" string(%d) "%sfrontcontroller21.phar.php" -string(45) "/frontcontroller21.phar.php/index.php?test=hi"
\ No newline at end of file +string(45) "/frontcontroller21.phar.php/index.php?test=hi" diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt index 74caa2c814..143b83659a 100644 --- a/ext/phar/tests/zip/frontcontroller21.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success zip-based --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -22,4 +23,4 @@ string(18) "/index.php?test=hi" string(37) "/frontcontroller21.phar.php/index.php" string(27) "/frontcontroller21.phar.php" string(%d) "%sfrontcontroller21.phar.php" -string(45) "/frontcontroller21.phar.php/index.php?test=hi"
\ No newline at end of file +string(45) "/frontcontroller21.phar.php/index.php?test=hi" diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 3ca0bda3bd..f51d6c2468 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1480,7 +1480,7 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z return NULL; } if (spl_cit_check_flags(flags) != SUCCESS) { - zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_CURRENT", 0 TSRMLS_CC); + zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER", 0 TSRMLS_CC); zend_restore_error_handling(&error_handling TSRMLS_CC); return NULL; } diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt index 499cd67559..dcb4287c45 100644 --- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt +++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt @@ -21,5 +21,5 @@ $test = new CachingIterator($arrayIterator, 3); // this throws an exception ?> ===DONE=== --EXPECTF-- -Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_CURRENT +Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER ===DONE=== |