diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 12:55:21 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 12:55:21 +0200 |
commit | 0146bab44966977cfb19d93d9dd9741b27cb2e18 (patch) | |
tree | d78c07906da287cf206a889282dc09bdfd4d025a | |
parent | 319e2bc42e7128aee6590dd83ee9dcb147180af7 (diff) | |
parent | 94d37a5dd7bc493de0842f8f704706bf13b57918 (diff) | |
download | php-git-0146bab44966977cfb19d93d9dd9741b27cb2e18.tar.gz |
Merge branch 'PHP-7.4'
29 files changed, 18 insertions, 42 deletions
diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt index a749493007..e6e950c628 100644 --- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt +++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt @@ -6,36 +6,36 @@ class MyIterator extends ArrayIterator { function __construct() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; } function rewind() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; return parent::rewind(); } function valid() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; return parent::valid(); } function current() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; return parent::current(); } function next() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; return parent::next(); } function key() { $args = func_get_args(); - echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; return parent::key(); } } diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt index a3c0581bc3..6d2ced3a71 100644 --- a/ext/spl/tests/arrayObject_magicMethods5.phpt +++ b/ext/spl/tests/arrayObject_magicMethods5.phpt @@ -16,19 +16,19 @@ class UsesMagic extends ArrayObject { function __get($name) { $args = func_get_args(); - echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; } function __set($name, $value) { $args = func_get_args(); - echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; } function __isset($name) { $args = func_get_args(); - echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; } function __unset($name) { $args = func_get_args(); - echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; + echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n"; } } diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index 12bfd325ae..eb502e0527 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -28,7 +28,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index c1f07d920f..8c24246aaa 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -29,7 +29,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 339e9b73a7..c7df0194ff 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -28,7 +28,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index 7f963a01fe..85f2aad363 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -29,7 +29,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 91d482276a..2f79be1b63 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -12,7 +12,6 @@ Dave Kelsey <d_kelsey@uk.ibm.com> set_include_path("rubbish"); testme(); -restore_include_path(); function testme() { diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index 76cf084029..4d613a9145 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -21,7 +21,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); function runtest() { diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 023586c396..5888688fa8 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 429650564b..5d639e8236 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index b5c7edbfbb..a3f5c1d3be 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 9cb40a0019..531b27e0bc 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -24,7 +24,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 7e02aa8efe..3647191128 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index bee941eb94..5479ddcf2d 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_relative_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index dca6f4df67..38e0f23958 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -27,7 +27,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index 601453573e..955d77bd27 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -27,7 +27,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 2a2781ec28..5996df369a 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -4,7 +4,6 @@ Bug #60570 (Stream context leaks when http request fails) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/bug69337.phpt b/ext/standard/tests/http/bug69337.phpt index ee9016e7bb..8de8187485 100644 --- a/ext/standard/tests/http/bug69337.phpt +++ b/ext/standard/tests/http/bug69337.phpt @@ -4,7 +4,6 @@ Bug #69337 (Stream context leaks when http request fails) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22345'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/http_response_header_01.phpt b/ext/standard/tests/http/http_response_header_01.phpt index 2facf4fae5..d364ebd153 100644 --- a/ext/standard/tests/http/http_response_header_01.phpt +++ b/ext/standard/tests/http/http_response_header_01.phpt @@ -4,7 +4,6 @@ $http_reponse_header (no redirect) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22346'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/http_response_header_02.phpt b/ext/standard/tests/http/http_response_header_02.phpt index 0d4da1af14..518ae9167b 100644 --- a/ext/standard/tests/http/http_response_header_02.phpt +++ b/ext/standard/tests/http/http_response_header_02.phpt @@ -4,7 +4,6 @@ $http_reponse_header (redirect) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22347'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/http_response_header_03.phpt b/ext/standard/tests/http/http_response_header_03.phpt index 866a9b3ba5..907983ac4b 100644 --- a/ext/standard/tests/http/http_response_header_03.phpt +++ b/ext/standard/tests/http/http_response_header_03.phpt @@ -4,7 +4,6 @@ $http_reponse_header (redirect + not found) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22348'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/http_response_header_04.phpt b/ext/standard/tests/http/http_response_header_04.phpt index 2ed00b8fa8..98badf9997 100644 --- a/ext/standard/tests/http/http_response_header_04.phpt +++ b/ext/standard/tests/http/http_response_header_04.phpt @@ -4,7 +4,6 @@ $http_reponse_header (header with trailing whitespace) <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22349'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/standard/tests/http/http_response_header_05.phpt b/ext/standard/tests/http/http_response_header_05.phpt index 871ea9e37a..dbdd7b8b1a 100644 --- a/ext/standard/tests/http/http_response_header_05.phpt +++ b/ext/standard/tests/http/http_response_header_05.phpt @@ -4,7 +4,6 @@ $http_reponse_header (whitespace-only "header") <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22350'); ?> --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- <?php require 'server.inc'; diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt index 866348efa0..77028fbd09 100644 --- a/ext/zlib/tests/gzfile_variation15.phpt +++ b/ext/zlib/tests/gzfile_variation15.phpt @@ -14,7 +14,6 @@ require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 set_include_path($newIncludePath); test_gzfile(); -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt index ce58e96f02..909d003537 100644 --- a/ext/zlib/tests/gzopen_variation4.phpt +++ b/ext/zlib/tests/gzopen_variation4.phpt @@ -26,7 +26,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_gzopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt index c223efeb15..99ba6a0b96 100644 --- a/ext/zlib/tests/gzopen_variation5.phpt +++ b/ext/zlib/tests/gzopen_variation5.phpt @@ -29,7 +29,6 @@ set_include_path($newpath); runtest(); teardown_relative_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt index 48115c7fdb..70f566446e 100644 --- a/ext/zlib/tests/readgzfile_variation15.phpt +++ b/ext/zlib/tests/readgzfile_variation15.phpt @@ -14,7 +14,6 @@ require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 set_include_path($newIncludePath); test_readgzfile(); -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 6885d1782c..25a4843c07 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -54,6 +54,7 @@ function normalizeOutput(string $out): string { $out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out); $out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out); $out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out); + $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out); return $out; } diff --git a/tests/basic/precision.phpt b/tests/basic/precision.phpt index 173b94701e..42f99dc9fb 100644 --- a/tests/basic/precision.phpt +++ b/tests/basic/precision.phpt @@ -13,7 +13,7 @@ ini_set('serialize_precision', -1); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -24,7 +24,7 @@ ini_set('serialize_precision', 0); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -34,7 +34,7 @@ ini_set('serialize_precision', 9); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -44,7 +44,7 @@ ini_set('serialize_precision', 14); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -54,7 +54,7 @@ ini_set('serialize_precision', 17); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -64,7 +64,7 @@ ini_set('serialize_precision', 25); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; @@ -74,7 +74,7 @@ ini_set('serialize_precision', 100); echo ini_get('precision'), PHP_EOL; echo ini_get('serialize_precision'), PHP_EOL; echo "OUTPUTS".PHP_EOL; -echo join($v, ' ').PHP_EOL; +echo join(' ', $v).PHP_EOL; var_dump(serialize($v)); var_export($v);echo PHP_EOL; --EXPECT-- |