chopins · chopins · Sep 12, 2020 · Sep 8, 2020 · Sep 8, 2020 · Sep 8, 2020
diff --git a/NEWS b/NEWS
@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Fixed bug #80057 (DateTimeImmutable::createFromFormat() does not populate
     time). (Derick)
 
+- FFI:
+  . Added FFI\CType::getName() method. (chopins)
+
 03 Sep 2020, PHP 8.0.0beta3
 
 - Calendar:

diff --git a/UPGRADING b/UPGRADING
@@ -135,10 +135,10 @@ PHP 8.0 UPGRADE NOTES
   . Uncaught exceptions now go through "clean shutdown", which means that
     destructors will be called after an uncaught exception.
   . Compile time fatal error "Only variables can be passed by reference" has
-    been delayed until runtime and converted to "Cannot pass parameter by
+    been delayed until runtime and converted to "Argument cannot be passed by
     reference" exception.
   . Some "Only variables should be passed by reference" notices have been
-    converted to "Cannot pass parameter by reference" exception.
+    converted to "Argument cannot be passed by reference" exception.
   . The generated name for anonymous classes has changed. It will now include
     the name of the first parent or interface:
 
@@ -403,6 +403,8 @@ PHP 8.0 UPGRADE NOTES
   . The openssl_pkey_free() function is deprecated and no longer has an effect,
     instead the OpenSSLAsymmetricKey instance is automatically destroyed if it is no
     longer referenced.
+  . openssl_seal() and openssl_open() now require $method to be passed, as the
+    previous default of "RC4" is considered insecure.
 
 - PCRE:
   . When passing invalid escape sequences they are no longer interpreted as
@@ -423,6 +425,13 @@ PHP 8.0 UPGRADE NOTES
 - PDO_ODBC:
   . The php.ini directive pdo_odbc.db2_instance_name has been removed
 
+- pgsql:
+  . The deprecated pg_connect() syntax using multiple parameters instead of a
+    connection string is no longer supported.
+  . The deprecated pg_lo_import() and pg_lo_export() signature that passes the
+    connection as the last argument is no longer supported. The connection
+    should be passed as first argument instead.
+
 - Phar:
   . Metadata associated with a phar will no longer be automatically unserialized,
     to fix potential security vulnerabilities due to object instantiation, autoloading, etc.
@@ -769,6 +778,14 @@ PHP 8.0 UPGRADE NOTES
   . Sorting functions are now stable, which means that equal-comparing elements
     will retain their original order.
     RFC: https://wiki.php.net/rfc/stable_sorting
+  . array_diff(), array_intersect() and their variations can now be used with
+    a single array as argument. This means that usages like the following are
+    now possible:
+
+        // OK even if $excludes is empty.
+        array_diff($array, ...$excludes);
+        // OK even if $arrays only contains a single array.
+        array_intersect(...$arrays);
 
 - Zip:
   . Extension updated to version 1.19.0

diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt
@@ -75,10 +75,10 @@ bool(false)
 string(3) "foo"
 bool(false)
 bool(false)
-get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
-get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
-get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
+get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given
+get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given
+get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given
 bool(false)
-get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given
-get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given
+get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given
+get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given
 Done
diff --git a/Zend/tests/arrow_functions/006.phpt b/Zend/tests/arrow_functions/006.phpt
@@ -41,4 +41,4 @@ array(3) {
   [2]=>
   int(30)
 }
-{closure}(): Argument #2 ($args) must be of type ?int, string given, called in %s on line %d
+{closure}(): Argument #2 must be of type ?int, string given, called in %s on line %d
diff --git a/Zend/tests/bug46106.phpt b/Zend/tests/bug46106.phpt
@@ -23,5 +23,5 @@ try {
 ?>
 DONE
 --EXPECT--
-str_pad() expects at least 2 parameters, 1 given
+str_pad() expects at least 2 arguments, 1 given
 DONE
diff --git a/Zend/tests/bug51827.phpt b/Zend/tests/bug51827.phpt
@@ -16,7 +16,7 @@ register_shutdown_function('exploDe');
 --EXPECT--
 int(1)
 
-Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0
+Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 arguments, 0 given in [no active file]:0
 Stack trace:
 #0 [internal function]: explode()
 #1 {main}

diff --git a/Zend/tests/bug72038.phpt b/Zend/tests/bug72038.phpt
@@ -6,28 +6,25 @@ Bug #72038 (Function calls with values to a by-ref parameter don't always throw
 try {
     test($foo = new stdClass);
     var_dump($foo);
-} catch (Throwable $e) {
-    echo "Exception: " . $e->getMessage() . "\n";
+} catch (Error $e) {
+    echo $e->getMessage() . "\n";
 }
 try {
     test($bar = 2);
     var_dump($bar);
-} catch (Throwable $e) {
-    echo "Exception: " . $e->getMessage() . "\n";
-}
-try {
-    test($baz = &$bar);
-    var_dump($baz);
-} catch (Throwable $e) {
-    echo "Exception: " . $e->getMessage() . "\n";
+} catch (Error $e) {
+    echo $e->getMessage() . "\n";
 }
 
+test($baz = &$bar);
+var_dump($baz);
+
 function test(&$param) {
         $param = 1;
 }
 
 ?>
 --EXPECT--
-Exception: Cannot pass parameter 1 by reference
-Exception: Cannot pass parameter 1 by reference
+test(): Argument #1 ($param) cannot be passed by reference
+test(): Argument #1 ($param) cannot be passed by reference
 int(1)
diff --git a/Zend/tests/bug72107.phpt b/Zend/tests/bug72107.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-func_get_args() expects exactly 0 parameters, 4 given
+func_get_args() expects exactly 0 arguments, 4 given
diff --git a/Zend/tests/bug73663_2.phpt b/Zend/tests/bug73663_2.phpt
@@ -12,7 +12,7 @@ change(list($val) = $array);
 var_dump($array);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %s:%d
+Fatal error: Uncaught Error: change(): Argument #1 ($ref) cannot be passed by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug78154.phpt b/Zend/tests/bug78154.phpt
@@ -22,5 +22,5 @@ namespace Foo {
 
 ?>
 --EXPECT--
-Exception: Cannot pass parameter 3 by reference
-Exception: Cannot pass parameter 3 by reference
+Exception: similar_text(): Argument #3 ($percent) cannot be passed by reference
+Exception: similar_text(): Argument #3 ($percent) cannot be passed by reference
diff --git a/Zend/tests/bug79783.phpt b/Zend/tests/bug79783.phpt
@@ -5,7 +5,7 @@ Bug #79783: Segfault in php_str_replace_common
 str_replace("a", "b", "c", strlen("d"));
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot pass parameter 4 by reference in %s:%d
+Fatal error: Uncaught Error: str_replace(): Argument #4 ($replace_count) cannot be passed by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closure_019.phpt
@@ -26,7 +26,7 @@ int(9)
 Notice: Only variable references should be returned by reference in %sclosure_019.php on line 4
 int(81)
 
-Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %s:%d
+Fatal error: Uncaught Error: {closure}(): Argument #1 ($x) cannot be passed by reference in %s:%d
 Stack trace:
 #0 %s(%d): test()
 #1 {main}

diff --git a/Zend/tests/errmsg_022.phpt b/Zend/tests/errmsg_022.phpt
@@ -11,7 +11,7 @@ foo(1);
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %s:%d
+Fatal error: Uncaught Error: foo(): Argument #1 ($var) cannot be passed by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-substr() expects at least 2 parameters, 1 given
+substr() expects at least 2 arguments, 1 given
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
@@ -11,14 +11,14 @@ try {
 }
 
 try {
-    array_diff([]);
+    array_diff();
 } catch (ArgumentCountError $e) {
     echo get_class($e) . PHP_EOL;
     echo $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
 ArgumentCountError
-substr() expects at least 2 parameters, 1 given
+substr() expects at least 2 arguments, 1 given
 ArgumentCountError
-At least 2 parameters are required, 1 given
+array_diff() expects at least 1 argument, 0 given
diff --git a/Zend/tests/function_arguments/variadic_argument_type_error.phpt b/Zend/tests/function_arguments/variadic_argument_type_error.phpt
@@ -19,5 +19,5 @@ try {
 
 ?>
 --EXPECTF--
-foo(): Argument #2 ($bar) must be of type int, array given, called in %s on line %d
-foo(): Argument #4 ($bar) must be of type int, array given, called in %s on line %d
+foo(): Argument #2 must be of type int, array given, called in %s on line %d
+foo(): Argument #4 must be of type int, array given, called in %s on line %d
diff --git a/Zend/tests/generators/errors/count_error.phpt b/Zend/tests/generators/errors/count_error.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECTF--
-Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
+Warning: count(): Argument #1 ($var) must be of type Countable|array, Generator given in %s on line %d
diff --git a/Zend/tests/match/027.phpt b/Zend/tests/match/027.phpt
@@ -30,8 +30,8 @@ main();
 usesValue 0
 i is 0
 
-Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %s027.php:20
+Fatal error: Uncaught Error: Test::usesRef(): Argument #1 ($x) cannot be passed by reference in %s:%d
 Stack trace:
-#0 %s027.php(23): main()
+#0 %s(%d): main()
 #1 {main}
-  thrown in %s027.php on line 20
+  thrown in %s on line %d
diff --git a/Zend/tests/match/028.phpt b/Zend/tests/match/028.phpt
@@ -34,4 +34,4 @@ try {
 usesValue 42
 usesValue 42
 int(42)
-Caught Cannot pass parameter 1 by reference
+Caught Test::usesRef(): Argument #1 ($x) cannot be passed by reference
diff --git a/Zend/tests/named_params/cannot_pass_by_ref.phpt b/Zend/tests/named_params/cannot_pass_by_ref.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-Cannot pass parameter 2 by reference
+test(): Argument #2 ($e) cannot be passed by reference
diff --git a/Zend/tests/nullsafe_operator/013.phpt b/Zend/tests/nullsafe_operator/013.phpt
@@ -50,10 +50,10 @@ int(0)
 string(98) "call_user_func_array(): Argument #1 ($function) must be a valid callback, no array or string given"
 string(77) "call_user_func_array(): Argument #2 ($args) must be of type array, null given"
 string(69) "get_class(): Argument #1 ($object) must be of type object, null given"
-string(56) "get_called_class() expects exactly 0 parameters, 1 given"
+string(55) "get_called_class() expects exactly 0 arguments, 1 given"
 string(4) "NULL"
-string(53) "func_num_args() expects exactly 0 parameters, 1 given"
-string(53) "func_get_args() expects exactly 0 parameters, 1 given"
+string(52) "func_num_args() expects exactly 0 arguments, 1 given"
+string(52) "func_get_args() expects exactly 0 arguments, 1 given"
 string(69) "array_slice(): Argument #1 ($array) must be of type array, null given"
 array(1) {
   [0]=>

diff --git a/Zend/tests/nullsafe_operator/016.phpt b/Zend/tests/nullsafe_operator/016.phpt
@@ -29,7 +29,7 @@ test(new Foo());
 
 ?>
 --EXPECT--
-Cannot pass parameter 1 by reference
-Cannot pass parameter 1 by reference
-Cannot pass parameter 1 by reference
-Cannot pass parameter 1 by reference
+set(): Argument #1 ($ref) cannot be passed by reference
+set(): Argument #1 ($ref) cannot be passed by reference
+set(): Argument #1 ($ref) cannot be passed by reference
+set(): Argument #1 ($ref) cannot be passed by reference
diff --git a/Zend/tests/str_or_obj_of_class_zpp.phpt b/Zend/tests/str_or_obj_of_class_zpp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Z_PARAM_STR_OR_OBJ_OF_CLASS() and Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL
+Test Z_PARAM_OBJ_OF_CLASS_OR_STR() and Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL
 --SKIPIF--
 <?php
 if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');

diff --git a/Zend/tests/str_or_obj_zpp.phpt b/Zend/tests/str_or_obj_zpp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Z_PARAM_STR_OR_OBJ() and Z_PARAM_STR_OR_OBJ_OR_NULL
+Test Z_PARAM_OBJ_OR_STR() and Z_PARAM_OBJ_OR_STR_OR_NULL
 --SKIPIF--
 <?php
 if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');

diff --git a/Zend/tests/variadic/by_ref_error.phpt b/Zend/tests/variadic/by_ref_error.phpt
@@ -9,7 +9,7 @@ test(1);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %s:%d
+Fatal error: Uncaught Error: test(): Argument #1 cannot be passed by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt
@@ -33,7 +33,7 @@ array(3) {
   }
 }
 
-Fatal error: Uncaught TypeError: test(): Argument #3 ($args) must be of type array, int given, called in %s:%d
+Fatal error: Uncaught TypeError: test(): Argument #3 must be of type array, int given, called in %s:%d
 Stack trace:
 #0 %s(%d): test(Array, Array, 2)
 #1 {main}

diff --git a/Zend/tests/variadic/typehint_suppressed_error.phpt b/Zend/tests/variadic/typehint_suppressed_error.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECTF--
-string(%d) "test(): Argument #3 ($args) must be of type array, int given, called in %s on line %d"
+string(%d) "test(): Argument #3 must be of type array, int given, called in %s on line %d"
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1311,30 +1311,21 @@ static ZEND_COLD void zend_error_impl(
 		zend_execute_data *ex;
 		const zend_op *opline;
 
-		switch (type) {
-			case E_CORE_ERROR:
-			case E_ERROR:
-			case E_RECOVERABLE_ERROR:
-			case E_PARSE:
-			case E_COMPILE_ERROR:
-			case E_USER_ERROR:
-				ex = EG(current_execute_data);
-				opline = NULL;
-				while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
-					ex = ex->prev_execute_data;
-				}
-				if (ex && ex->opline->opcode == ZEND_HANDLE_EXCEPTION &&
-				    EG(opline_before_exception)) {
-					opline = EG(opline_before_exception);
-				}
-				zend_exception_error(EG(exception), E_WARNING);
-				EG(exception) = NULL;
-				if (opline) {
-					ex->opline = opline;
-				}
-				break;
-			default:
-				break;
+		if (type & E_FATAL_ERRORS) {
+			ex = EG(current_execute_data);
+			opline = NULL;
+			while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
+				ex = ex->prev_execute_data;
+			}
+			if (ex && ex->opline->opcode == ZEND_HANDLE_EXCEPTION &&
+			    EG(opline_before_exception)) {
+				opline = EG(opline_before_exception);
+			}
+			zend_exception_error(EG(exception), E_WARNING);
+			EG(exception) = NULL;
+			if (opline) {
+				ex->opline = opline;
+			}
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,4 @@ array(3) { @@
       [2]=>
       int(30)
     }
-    {closure}(): Argument #2 ($args) must be of type ?int, string given, called in %s on line %d
+    {closure}(): Argument #2 must be of type ?int, string given, called in %s on line %d