From 9a274de4f45f5aac2c8ce9370b3e572281ff9f94 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 10:34:49 +0200 Subject: [PATCH 1/4] Improve bless_tests If a string var_dump contains a wildcard, also make the length a wildcard. --- scripts/dev/bless_tests.php | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 19c24bf188a..190ebfb86a6 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -53,6 +53,7 @@ function normalizeOutput(string $out): string { $out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out); $out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out); $out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out); + $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out); return $out; } From 2e56e14e39ee7917d255e22656f3f96cc7c89842 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 10:43:32 +0200 Subject: [PATCH 2/4] Swap implode() argument order in some tests --- .../tests/arrayObject_getIteratorClass_basic1.phpt | 12 ++++++------ ext/spl/tests/arrayObject_magicMethods5.phpt | 8 ++++---- tests/basic/precision.phpt | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt index a7494930075..e6e950c628d 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 a3c0581bc39..6d2ced3a719 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/tests/basic/precision.phpt b/tests/basic/precision.phpt index 173b94701ea..42f99dc9fb5 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-- From 9345c191db71a5d0125218b60d333b3ef293df27 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 12:17:24 +0200 Subject: [PATCH 3/4] Remove unnecessary uses of restore_include_path() in tests --- ext/standard/tests/file/file_get_contents_variation1.phpt | 1 - ext/standard/tests/file/file_get_contents_variation2.phpt | 1 - ext/standard/tests/file/file_put_contents_variation4.phpt | 1 - ext/standard/tests/file/file_put_contents_variation6.phpt | 1 - ext/standard/tests/file/fopen_variation12.phpt | 1 - ext/standard/tests/file/fopen_variation13.phpt | 1 - ext/standard/tests/file/fopen_variation16.phpt | 1 - ext/standard/tests/file/fopen_variation17.phpt | 1 - ext/standard/tests/file/fopen_variation5.phpt | 1 - ext/standard/tests/file/fopen_variation7.phpt | 1 - ext/standard/tests/file/fopen_variation8.phpt | 1 - ext/standard/tests/file/fopen_variation9.phpt | 1 - ext/standard/tests/file/readfile_variation6.phpt | 1 - ext/standard/tests/file/readfile_variation7.phpt | 1 - ext/zlib/tests/gzfile_variation15.phpt | 1 - ext/zlib/tests/gzopen_variation4.phpt | 1 - ext/zlib/tests/gzopen_variation5.phpt | 1 - ext/zlib/tests/readgzfile_variation15.phpt | 1 - 18 files changed, 18 deletions(-) diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index 12bfd325ae7..eb502e05277 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 c1f07d920fb..8c24246aaac 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 339e9b73a7c..c7df0194ff0 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 7f963a01fe4..85f2aad3632 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 91d482276af..2f79be1b63f 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -12,7 +12,6 @@ Dave Kelsey 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 76cf084029b..4d613a91454 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 023586c3968..5888688fa89 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 429650564bc..5d639e8236c 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 b5c7edbfbb1..a3f5c1d3be9 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 9cb40a00198..531b27e0bc0 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 7e02aa8efe0..36471911289 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 bee941eb945..5479ddcf2d2 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 dca6f4df673..38e0f239586 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 601453573e2..955d77bd275 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/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt index 866348efa0e..77028fbd09a 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 1648b75fb96..6a00c30670f 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 c223efeb15d..99ba6a0b963 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 48115c7fdb8..70f566446ec 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); From 94d37a5dd7bc493de0842f8f704706bf13b57918 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 12:43:41 +0200 Subject: [PATCH 4/4] Remove unnecessary uses of allow_url_include in tests --- ext/standard/tests/http/bug60570.phpt | 1 - ext/standard/tests/http/bug69337.phpt | 1 - ext/standard/tests/http/http_response_header_01.phpt | 1 - ext/standard/tests/http/http_response_header_02.phpt | 1 - ext/standard/tests/http/http_response_header_03.phpt | 1 - ext/standard/tests/http/http_response_header_04.phpt | 1 - ext/standard/tests/http/http_response_header_05.phpt | 1 - 7 files changed, 7 deletions(-) diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 2a2781ec28b..5996df369a0 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) --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE-- --INI-- allow_url_fopen=1 -allow_url_include=1 --FILE--