Merge branch 'PHP-7.4'

nikic · nikic · commit 0146bab44966 · 2019-07-12T12:55:21.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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--

Original file line number	Diff line number	Diff line change
`@@ -6,36 +6,36 @@ class MyIterator extends ArrayIterator {`
`6`	`6`
`7`	`7`	`function __construct() {`
`8`	`8`	`$args = func_get_args();`
`9`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`9`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`function rewind() {`
`13`	`13`	`$args = func_get_args();`
`14`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`14`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`15`	`15`	`return parent::rewind();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`function valid() {`
`19`	`19`	`$args = func_get_args();`
`20`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`20`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`21`	`21`	`return parent::valid();`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`function current() {`
`25`	`25`	`$args = func_get_args();`
`26`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`26`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`27`	`27`	`return parent::current();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function next() {`
`31`	`31`	`$args = func_get_args();`
`32`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`32`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`33`	`33`	`return parent::next();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function key() {`
`37`	`37`	`$args = func_get_args();`
`38`		`- echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`38`	`+ echo " In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`39`	`39`	`return parent::key();`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ class UsesMagic extends ArrayObject {`
`16`	`16`
`17`	`17`	`function __get($name) {`
`18`	`18`	`$args = func_get_args();`
`19`		`- echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`19`	`+ echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`20`	`20`	`}`
`21`	`21`	`function __set($name, $value) {`
`22`	`22`	`$args = func_get_args();`
`23`		`- echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`23`	`+ echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`24`	`24`	`}`
`25`	`25`	`function __isset($name) {`
`26`	`26`	`$args = func_get_args();`
`27`		`- echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`27`	`+ echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`28`	`28`	`}`
`29`	`29`	`function __unset($name) {`
`30`	`30`	`$args = func_get_args();`
`31`		`- echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";`
	`31`	`+ echo "In " . __METHOD__ . "(" . implode(',', $args) . ")\n";`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt");`
`45`	`45`	`foreach($modes as $mode) {`
`46`	`46`	`test_fopen($mode);`
`47`	`47`	`}`
`48`		`-restore_include_path();`
`49`	`48`
`50`	`49`	`// remove the directory structure`
`51`	`50`	`chdir($baseDir);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ $modes = array("r", "r+", "rt");`
`26`	`26`	`foreach($modes as $mode) {`
`27`	`27`	`test_gzopen($mode);`
`28`	`28`	`}`
`29`		`-restore_include_path();`
`30`	`29`
`31`	`30`	`// remove the directory structure`
`32`	`31`	`chdir($baseDir);`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ function normalizeOutput(string $out): string {`
`54`	`54`	`$out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out);`
`55`	`55`	`$out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out);`
`56`	`56`	`$out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out);`
	`57`	`+ $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out);`
`57`	`58`	`return $out;`
`58`	`59`	`}`
`59`	`60`