Merge branch 'PHP-7.4'

nikic · nikic · commit d37d418927f7 · 2019-07-23T11:28:10.000+02:00
diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt
@@ -3,7 +3,7 @@ Bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
 --FILE--
 <?php
 
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL);
 
 var_dump(error_reporting());
 
@@ -14,7 +14,7 @@ function make_exception()
 
 function make_exception_and_change_err_reporting()
 {
-    error_reporting(E_ALL & ~E_STRICT);
+    error_reporting(E_ALL & ~E_NOTICE);
     throw new Exception();
 }
 
@@ -36,5 +36,5 @@ echo "Done\n";
 --EXPECT--
 int(32767)
 int(32767)
-int(30719)
+int(32759)
 Done
diff --git a/Zend/tests/bug62956.phpt b/Zend/tests/bug62956.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #62956: "incompatible" signatures for private methods should not cause E_STRICT
+Bug #62956: "incompatible" signatures for private methods should not cause E_WARNING
 --FILE--
 <?php
 class Base
diff --git a/Zend/tests/bug64988.phpt b/Zend/tests/bug64988.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64988 (Class loading order affects E_STRICT warning)
+Bug #64988 (Class loading order affects E_WARNING warning)
 --FILE--
 <?php
 abstract class Base1 {
diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug67436: E_STRICT instead of custom error handler
+bug67436: E_WARNING instead of custom error handler
 --FILE--
 <?php
 
diff --git a/Zend/tests/error_reporting02.phpt b/Zend/tests/error_reporting02.phpt
@@ -3,13 +3,13 @@ testing @ and error_reporting - 2
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 function foo($arg) {
 }
 
 function bar() {
-	error_reporting(E_ALL|E_STRICT);
+	error_reporting(E_ALL);
 	throw new Exception("test");
 }
 
diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt
@@ -3,7 +3,7 @@ testing @ and error_reporting - 3
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 function foo($arg) {
 	echo @$nonex_foo;
@@ -16,7 +16,7 @@ function bar() {
 
 function foo1() {
 	echo $undef1;
-	error_reporting(E_ALL|E_STRICT);
+	error_reporting(E_ALL);
 	echo $undef2;
 }
 
diff --git a/Zend/tests/error_reporting04.phpt b/Zend/tests/error_reporting04.phpt
@@ -3,11 +3,11 @@ testing @ and error_reporting - 4
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 function foo() {
 	echo $undef;
-	error_reporting(E_ALL|E_STRICT);
+	error_reporting(E_ALL);
 }
 
 
diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt
@@ -3,7 +3,7 @@ testing @ and error_reporting - 8
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 function foo1($arg) {
 }
@@ -12,7 +12,7 @@ function foo2($arg) {
 }
 
 function foo3() {
-	error_reporting(E_ALL|E_STRICT);
+	error_reporting(E_ALL);
 	echo $undef3;
 	throw new Exception("test");
 }
diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt
@@ -3,7 +3,7 @@ testing @ and error_reporting - 9
 --FILE--
 <?php
 
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_DEPRECATED);
 
 function bar() {
 	echo @$blah;
@@ -12,7 +12,7 @@ function bar() {
 
 function foo() {
 	echo @$undef;
-	error_reporting(E_ALL|E_STRICT);
+	error_reporting(E_ALL);
 	echo $blah;
 	return bar();
 }
diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exception_004.phpt
@@ -3,8 +3,6 @@ Throwing exception using a class that isn't derived from the Exception base clas
 --FILE--
 <?php
 
-error_reporting(E_ALL|E_STRICT);
-
 class Foo { }
 
 try {
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -765,7 +765,7 @@ static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info *
 		return 0;
 	}
 	if (is_callable_error) {
-		/* Possible E_STRICT error message */
+		/* Possible error message */
 		efree(is_callable_error);
 	}
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
@@ -19,9 +19,9 @@ MySQLPDOTest::skip();
 				return call_user_func_array(array($this, 'parent::__construct'), func_get_args());
 			}
 
-			public function exec($query) {
+			public function exec($statement) {
 				$this->protocol();
-				return call_user_func_array(array($this, 'parent::exec'), func_get_args());
+				return parent::exec($statement);
 			}
 
 			public function query() {
diff --git a/ext/pdo_pgsql/tests/bug72294.phpt b/ext/pdo_pgsql/tests/bug72294.phpt
@@ -74,7 +74,7 @@ class PHPUnit_Framework_TestResult
 
         $oldErrorHandler = set_error_handler(
             'handleError',
-            E_ALL | E_STRICT
+            E_ALL
         );
 
         try {
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -934,7 +934,7 @@ int phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len) /* {
 		return FAILURE;
 	}
 
-	/* this archive has no open references, so emit an E_STRICT and remove it */
+	/* this archive has no open references, so emit a notice and remove it */
 	if (zend_hash_str_del(&(PHAR_G(phar_fname_map)), phar->fname, phar->fname_len) != SUCCESS) {
 		return FAILURE;
 	}
diff --git a/ext/soap/tests/bugs/bug46427.phpt b/ext/soap/tests/bugs/bug46427.phpt
@@ -4,7 +4,6 @@ Bug #46427 (SoapClient() stumbles over its "stream_context" parameter)
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-error_reporting(E_ALL|E_STRICT);
 
 function getSoapClient_1() {
     $ctx = stream_context_create();
diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.data b/ext/standard/tests/general_functions/parse_ini_booleans.data
@@ -3,8 +3,8 @@ foo = E_ALL E_NOTICE
 error_reporting = E_ALL
 error_reporting1 = E_COMPILE_ERROR|E_RECOVERABLE_ERROR	|E_ERROR|E_CORE_ERROR 	
 error_reporting2 = E_ALL&~E_NOTICE	 	 	
-error_reporting3 =  E_ALL & ~E_NOTICE 	 
-error_reporting4 = E_ALL & ~E_NOTICE | E_STRICT 
+error_reporting3 =  E_ALL & ~E_NOTICE
+error_reporting4 = E_ALL & ~E_NOTICE | E_PARSE
 
 ['true or false']
 bool_true = 	true 
diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
@@ -19,7 +19,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localhost");
 ini_set("smtp_port", 25);
 ini_set("sendmail_from", "user@example.com");
diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
@@ -18,8 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
-
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(__DIR__.'/mail_include.inc');
 $subject_prefix = "!**PHPT**!";
diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
@@ -18,8 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
-
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(__DIR__.'/mail_include.inc');
 $subject_prefix = "!**PHPT**!";
diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
@@ -18,8 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
-
 echo "*** Testing mail() : basic functionality ***\n";
 require_once(__DIR__.'/mail_include.inc');
 $subject_prefix = "!**PHPT**!";
diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
@@ -18,7 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localhost");
 ini_set("smtp_port", 2525);
 ini_set("sendmail_from", "user@example.com");
diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
@@ -18,7 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localplace");
 ini_set("smtp_port", 25);
 ini_set("sendmail_from", "user@example.com");
diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt
@@ -18,7 +18,6 @@ max_execution_time = 120
  * Alias to functions:
  */
 
-error_reporting(E_ALL & ~E_STRICT);
 ini_set("SMTP", "localhost");
 ini_set("smtp_port", 25);
 
diff --git a/ext/zip/examples/get_set_comments.php b/ext/zip/examples/get_set_comments.php
@@ -1,5 +1,4 @@
 <?php
-error_reporting(E_ALL|E_STRICT);
 
 copy('test_with_comment.zip', 't.zip');
 $z = new ZipArchive;
diff --git a/run-tests.php b/run-tests.php
@@ -238,7 +238,7 @@ function main()
 		'open_basedir=',
 		'disable_functions=',
 		'output_buffering=Off',
-		'error_reporting=' . (E_ALL | E_STRICT),
+		'error_reporting=' . E_ALL,
 		'display_errors=1',
 		'display_startup_errors=1',
 		'log_errors=0',
@@ -1624,7 +1624,7 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
 								'E_USER_ERROR',
 								'E_USER_WARNING',
 								'E_USER_NOTICE',
-								'E_STRICT',
+								'E_STRICT', // TODO Cleanup when removed from Zend Engine.
 								'E_RECOVERABLE_ERROR',
 								'E_USER_DEPRECATED'
 							];
diff --git a/tests/func/011.phpt b/tests/func/011.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test bitwise AND, OR, XOR, NOT and logical NOT in INI via error_reporting
 --INI--
-error_reporting = E_ALL & E_NOTICE | E_STRICT ^ E_DEPRECATED & ~E_WARNING | !E_ERROR
+error_reporting = E_ALL & E_NOTICE | E_PARSE ^ E_DEPRECATED & ~E_WARNING | !E_ERROR
 --FILE--
 <?php
 echo ini_get('error_reporting');
 ?>
 --EXPECT--
-10248
+8204
diff --git a/tests/func/bug64523.phpt b/tests/func/bug64523.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Bug #64523: XOR not parsed in INI
 --INI--
-error_reporting = E_ALL ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED
+error_reporting = E_ALL ^ E_NOTICE ^ E_WARNING ^ E_DEPRECATED
 --FILE--
 <?php
 echo ini_get('error_reporting');
 ?>
 --EXPECT--
-22519
+24565

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 --TEST--
 -bug67436: E_STRICT instead of custom error handler
 +bug67436: E_WARNING instead of custom error handler
 --FILE--
 <?php
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ testing @ and error_reporting - 2`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`
`6`		`-error_reporting(E_ALL);`
	`6`	`+error_reporting(E_ALL & ~E_DEPRECATED);`
`7`	`7`
`8`	`8`	`function foo($arg) {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`function bar() {`
`12`		`- error_reporting(E_ALL\|E_STRICT);`
	`12`	`+ error_reporting(E_ALL);`
`13`	`13`	`throw new Exception("test");`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ testing @ and error_reporting - 8`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`	`5`
`6`		`-error_reporting(E_ALL);`
	`6`	`+error_reporting(E_ALL & ~E_DEPRECATED);`
`7`	`7`
`8`	`8`	`function foo1($arg) {`
`9`	`9`	`}`
`@@ -12,7 +12,7 @@ function foo2($arg) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`function foo3() {`
`15`		`- error_reporting(E_ALL\|E_STRICT);`
	`15`	`+ error_reporting(E_ALL);`
`16`	`16`	`echo $undef3;`
`17`	`17`	`throw new Exception("test");`
`18`	`18`	`}`