Girgias · Girgias · Jul 8, 2020 · Jul 8, 2020 · Jul 8, 2020 · Jul 9, 2020
diff --git a/UPGRADING b/UPGRADING
@@ -320,6 +320,10 @@ PHP 8.0 UPGRADE NOTES
     ISO 8859 aliases with underscores (ISO_8859_* and ISO8859_*) have also been
     removed.
 
+- OCI8:
+  . Several alias functions have been marked as deprecated.
+  . oci_internal_debug() and its alias ociinternaldebug() have been removed.
+
 - PCRE:
   . When passing invalid escape sequences they are no longer interpreted as
     literals. This behaviour previously required the X modifier - which is
@@ -571,6 +575,8 @@ PHP 8.0 UPGRADE NOTES
   . Added support for constructor property promotion (declaring properties in
     the constructor signature).
     RFC: https://wiki.php.net/rfc/constructor_promotion
+  . Added support for `match` expression.
+    RFC: https://wiki.php.net/rfc/match_expression_v2
 
 - Date:
   . Added DateTime::createFromInterface() and
@@ -886,6 +892,9 @@ PHP 8.0 UPGRADE NOTES
     shell now consistently execute `%comspec% /s /c "$commandline"`, which has
     the same effect as executing `$commandline` (without additional quotes).
 
+- GD:
+  . php_gd2.dll has been renamed to php_gd.dll.
+
 - php-test-pack:
   . The test runner has been renamed from run-test.php to run-tests.php, to
     match its name in php-src.

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -20,6 +20,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   q. GC_COLLECTABLE flag
   r. Cannot implement Traversable only
   s. zend_fcall_info no_separation flag removed
+  t. Signature changes
 
 2. Build system changes
   a. Abstract
@@ -89,7 +90,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   j. compare_objects() handler was removed. Extensions should use compare() object
      handler instead and check if both arguments are objects and have the same
      compare handler, using ZEND_COMPARE_OBJECTS_FALLBACK() macro.
-     
+
   k. The 'I' length modifier, used to denote 32 and 64bit integer from the custom
      snprintf and spprintf implementations has been removed.
      Use the ZEND_LONG_FMT, ZEND_ULONG_FMT and ZEND_XLONG_FMT macros defined in
@@ -136,11 +137,22 @@ PHP 8.0 INTERNALS UPGRADE NOTES
              zend_create_internal_iterator_zval(return_value, ZEND_THIS);
          }
 
-   s. The zend_fcall_info no_separation flag has been removed, and separation is
+  s. The zend_fcall_info no_separation flag has been removed, and separation is
       never allowed. If you wish to pass (or allow passing) arguments by
       reference, explicitly create those arguments as references using
       ZEND_MAKE_REF.
 
+  t. The following ZEND_API function have changed signature:
+     1. Void in Zend Engine 4.0:
+        - add_assoc_*()
+        - add_index_*()
+        - add_property_*()
+        - object_init()
+        - zend_declare_class_constant*()
+        - zend_declare_property*()
+        - zend_startup_modules()
+        - zend_wrong_parameters_none_error()
+
 ========================
 2. Build system changes
 ========================

diff --git a/Zend/tests/018.phpt b/Zend/tests/018.phpt
@@ -18,7 +18,7 @@ var_dump(constant("TEST_CONST2"));
 echo "Done\n";
 ?>
 --EXPECT--
-Undefined constant ''
+Undefined constant ""
 int(1)
 string(4) "test"
 Done
diff --git a/Zend/tests/024.phpt b/Zend/tests/024.phpt
@@ -41,17 +41,17 @@ NULL
 Warning: Undefined variable $b in %s on line %d
 int(1)
 
-Warning: Attempt to read property '1' on int in %s on line %d
+Warning: Attempt to read property "1" on int in %s on line %d
 NULL
 
-Warning: Attempt to read property '1' on int in %s on line %d
+Warning: Attempt to read property "1" on int in %s on line %d
 NULL
 
 Warning: Undefined variable $c in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Attempt to read property '1' on int in %s on line %d
+Warning: Attempt to read property "1" on int in %s on line %d
 
-Warning: Attempt to read property '' on null in %s on line %d
+Warning: Attempt to read property "" on null in %s on line %d
 NULL
diff --git a/Zend/tests/026.phpt b/Zend/tests/026.phpt
@@ -22,7 +22,7 @@ print "ok\n";
 
 ?>
 --EXPECTF--
-Warning: Attempt to read property 'a' on null in %s on line %d
+Warning: Attempt to read property "a" on null in %s on line %d
 ok
-Attempt to assign property 'a' on null
+Attempt to assign property "a" on null
 ok
diff --git a/Zend/tests/028.phpt b/Zend/tests/028.phpt
@@ -18,7 +18,7 @@ bool(true)
 bool(true)
 bool(true)
 
-Notice: Undefined offset: 2 in %s on line %d
+Notice: Undefined array key 2 in %s on line %d
 
 Fatal error: Uncaught Error: Value of type null is not callable in %s:%d
 Stack trace:

diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt
@@ -61,6 +61,6 @@ Warning: Trying to access array offset on value of type null in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Attempt to read property 'foo' on null in %s on line %d
-Attempt to assign property 'foo' on null
-Attempt to assign property 'bar' on null
+Warning: Attempt to read property "foo" on null in %s on line %d
+Attempt to assign property "foo" on null
+Attempt to assign property "bar" on null
diff --git a/Zend/tests/037.phpt b/Zend/tests/037.phpt
@@ -16,7 +16,7 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)
 
-Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
+Fatal error: Uncaught Error: Access to undeclared static property Closure::$x in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/access_modifiers_008.phpt b/Zend/tests/access_modifiers_008.phpt
@@ -18,4 +18,4 @@ B2::test();
 
 ?>
 --EXPECTF--
-Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d
+Fatal error: Call to protected method B1::f() from scope B2 in %s on line %d
diff --git a/Zend/tests/access_modifiers_009.phpt b/Zend/tests/access_modifiers_009.phpt
@@ -23,4 +23,4 @@ B2::test();
 --EXPECTF--
 bool(false)
 
-Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d
+Fatal error: Call to protected method B1::f() from scope B2 in %s on line %d
diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers_010.phpt
@@ -28,7 +28,7 @@ new c;
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private method d::test2() from context 'a' in %s:%d
+Fatal error: Uncaught Error: Call to private method d::test2() from scope a in %s:%d
 Stack trace:
 #0 %s(%d): a->test()
 #1 %s(%d): c->__construct()

diff --git a/Zend/tests/array_offset.phpt b/Zend/tests/array_offset.phpt
@@ -11,11 +11,11 @@ Ensure "undefined offset" notice formats message correctly when undefined key is
 echo "Done\n";
 ?>
 --EXPECTF--
-Notice: Undefined offset: -1 in %s on line 3
+Notice: Undefined array key -1 in %s on line %d
 
-Notice: Undefined offset: -1 in %s on line 4
+Notice: Undefined array key -1 in %s on line %d
 
-Notice: Undefined offset: -1 in %s on line 5
+Notice: Undefined array key -1 in %s on line 5
 
-Notice: Undefined offset: -1 in %s on line 6
+Notice: Undefined array key -1 in %s on line 6
 Done
diff --git a/Zend/tests/array_unpack/classes.phpt b/Zend/tests/array_unpack/classes.phpt
@@ -43,4 +43,4 @@ array(3) {
   [2]=>
   int(3)
 }
-Exception: Cannot declare self-referencing constant 'self::B'
+Exception: Cannot declare self-referencing constant self::B
diff --git a/Zend/tests/assign_dim_obj_null_return.phpt b/Zend/tests/assign_dim_obj_null_return.phpt
@@ -79,5 +79,5 @@ Cannot add element to the array as the next element is already occupied
 Illegal offset type
 Illegal offset type
 Cannot use a scalar value as an array
-Attempt to assign property 'foo' on bool
-Attempt to assign property 'foo' on bool
+Attempt to assign property "foo" on bool
+Attempt to assign property "foo" on bool
diff --git a/Zend/tests/attributes/003_ast_nodes.phpt b/Zend/tests/attributes/003_ast_nodes.phpt
@@ -104,6 +104,5 @@ array(1) {
 }
 
 int(1)
-string(30) "Class 'MissingClass' not found"
-string(30) "Class 'MissingClass' not found"
-
+string(30) "Class "MissingClass" not found"
+string(30) "Class "MissingClass" not found"
diff --git a/Zend/tests/attributes/005_objects.phpt b/Zend/tests/attributes/005_objects.phpt
@@ -108,13 +108,13 @@ string(7) "ERROR 2"
 string(74) "A1::__construct(): Argument #1 ($name) must be of type string, array given"
 
 string(7) "ERROR 3"
-string(30) "Attribute class 'A2' not found"
+string(30) "Attribute class "A2" not found"
 
 string(7) "ERROR 4"
-string(50) "Attribute constructor of class 'A3' must be public"
+string(48) "Attribute constructor of class A3 must be public"
 
 string(7) "ERROR 5"
-string(71) "Attribute class 'A4' does not have a constructor, cannot pass arguments"
+string(69) "Attribute class A4 does not have a constructor, cannot pass arguments"
 
 string(7) "ERROR 6"
-string(55) "Attempting to use non-attribute class 'A5' as attribute"
+string(55) "Attempting to use non-attribute class "A5" as attribute"
diff --git a/Zend/tests/attributes/006_filter.phpt b/Zend/tests/attributes/006_filter.phpt
@@ -109,4 +109,4 @@ Array
 string(7) "ERROR 1"
 string(103) "ReflectionFunctionAbstract::getAttributes(): Argument #2 ($flags) must be a valid attribute filter flag"
 string(7) "ERROR 2"
-string(34) "Class 'SomeMissingClass' not found"
+string(34) "Class "SomeMissingClass" not found"
diff --git a/Zend/tests/attributes/013_class_scope.phpt b/Zend/tests/attributes/013_class_scope.phpt
@@ -34,7 +34,7 @@ trait T1
 class C2
 {
 	use T1;
-	
+
 	private const FOO = 'bar';
 }
 
@@ -109,7 +109,7 @@ Array
     [1] => bar
 )
 string(7) "ERROR 1"
-string(36) "Undefined class constant 'self::FOO'"
+string(28) "Undefined constant self::FOO"
 
 bool(true)
 string(3) "bar"

diff --git a/Zend/tests/attributes/023_ast_node_in_validation.phpt b/Zend/tests/attributes/023_ast_node_in_validation.phpt
@@ -8,4 +8,4 @@ class A1 { }
 
 ?>
 --EXPECTF--
-Fatal error: Class 'Foo' not found in %s
+Fatal error: Class "Foo" not found in %s on line %d
diff --git a/Zend/tests/bug29015.phpt b/Zend/tests/bug29015.phpt
@@ -15,7 +15,7 @@ object(stdClass)#1 (1) {
   string(10) "string('')"
 }
 
-Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
+Fatal error: Uncaught Error: Cannot access property starting with "\0" in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug29883.phpt b/Zend/tests/bug29883.phpt
@@ -15,7 +15,7 @@ bool(false)
 bool(true)
 bool(true)
 
-Warning: Uninitialized string offset: -10 in %s on line %d
+Warning: Uninitialized string offset -10 in %s on line %d
 string(0) ""
 string(1) "u"
 string(1) "u"
diff --git a/Zend/tests/bug30519.phpt b/Zend/tests/bug30519.phpt
@@ -6,7 +6,7 @@ class test implements a {
 }
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Interface 'a' not found in %s:%d
+Fatal error: Uncaught Error: Interface "a" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug30922.phpt b/Zend/tests/bug30922.phpt
@@ -10,7 +10,7 @@ var_dump($a instanceOf A);
 echo "ok\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Interface 'RecurisiveFooFar' not found in %s:%d
+Fatal error: Uncaught Error: Interface "RecurisiveFooFar" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug31098.phpt b/Zend/tests/bug31098.phpt
@@ -44,12 +44,12 @@ ok
 ok
 ok
 
-Warning: Attempt to read property 'wrong' on string in %s on line %d
+Warning: Attempt to read property "wrong" on string in %s on line %d
 ok
 
-Warning: Illegal string offset 'wrong' in %s on line %d
+Warning: Illegal string offset "wrong" in %s on line %d
 ok
 ok
 
-Warning: Illegal string offset 'wrong' in %s on line %d
+Warning: Illegal string offset "wrong" in %s on line %d
 ok
diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt
@@ -43,7 +43,7 @@ Caught: Test1::__construct
 Caught: {closure}
 {closure}(Test3,3)
 
-Fatal error: Uncaught Error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1
+Fatal error: Uncaught Error: Class "Test3" not found in %s:%d
 Stack trace:
 #0 %s(%d): eval()
 #1 {main}

diff --git a/Zend/tests/bug37632.phpt b/Zend/tests/bug37632.phpt
@@ -132,7 +132,7 @@ B2::doTest
 C2::test
 B4::doTest
 
-Fatal error: Uncaught Error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php:%d
+Fatal error: Uncaught Error: Call to protected C4::__construct() from scope B4 in %s:%d
 Stack trace:
 #0 %s(%d): B4::doTest()
 #1 {main}

diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
@@ -29,7 +29,7 @@ var_dump($obj);
 --EXPECTF--
 string(3) "bar"
 
-Notice: Undefined offset: 2 in %sbug37667.php on line 16
+Notice: Undefined array key 2 in %s on line %d
 NULL
 object(Test)#%d (1) {
   ["property":protected]=>

diff --git a/Zend/tests/bug37811.phpt b/Zend/tests/bug37811.phpt
@@ -23,7 +23,7 @@ string(3) "Foo"
 
 Warning: Constants may only evaluate to scalar values, arrays or resources in %sbug37811.php on line %d
 
-Fatal error: Uncaught Error: Undefined constant 'Baz' in %s:%d
+Fatal error: Uncaught Error: Undefined constant "Baz" in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/bug39018.phpt
@@ -64,39 +64,39 @@ print "\nDone\n";
 --EXPECTF--
 Warning: String offset cast occurred in %s on line %d
 
-Warning: Uninitialized string offset: %s in %s on line %d
+Warning: Uninitialized string offset %d in %s on line %d
 
-Warning: Uninitialized string offset: 0 in %s on line %d
+Warning: Uninitialized string offset 0 in %s on line %d
 
-Warning: Uninitialized string offset: 0 in %s on line %d
+Warning: Uninitialized string offset 0 in %s on line %d
 
 Warning: String offset cast occurred in %s on line %d
 
-Warning: Uninitialized string offset: %i in %s on line %d
+Warning: Uninitialized string offset %i in %s on line %d
 
 Warning: String offset cast occurred in %s on line %d
 
-Warning: Uninitialized string offset: %i in %s on line %d
+Warning: Uninitialized string offset %i in %s on line %d
 
-Warning: Uninitialized string offset: 0 in %s on line %d
+Warning: Uninitialized string offset 0 in %s on line %d
 
-Warning: Uninitialized string offset: 4 in %s on line %d
+Warning: Uninitialized string offset 4 in %s on line %d
 
-Warning: Uninitialized string offset: 4 in %s on line %d
+Warning: Uninitialized string offset 4 in %s on line %d
 
-Warning: Uninitialized string offset: 4 in %s on line %d
+Warning: Uninitialized string offset 4 in %s on line %d
 
-Warning: Uninitialized string offset: 4 in %s on line %d
+Warning: Uninitialized string offset 4 in %s on line %d
 
-Warning: Uninitialized string offset: 4 in %s on line %d
+Warning: Uninitialized string offset 4 in %s on line %d
 
 Warning: String offset cast occurred in %s on line %d
 
-Warning: Uninitialized string offset: 12 in %s on line %d
+Warning: Uninitialized string offset 12 in %s on line %d
 
 Warning: String offset cast occurred in %s on line %d
 
-Warning: Uninitialized string offset: 12 in %s on line %d
+Warning: Uninitialized string offset 12 in %s on line %d
 
 Warning: String offset cast occurred in %s on line %d
 

diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt
@@ -7,6 +7,6 @@ Bug #39304 (Segmentation fault with list unpacking of string offset)
   var_dump($a,$b);
 ?>
 --EXPECTF--
-Warning: Uninitialized string offset: 0 in %s on line %d
+Warning: Uninitialized string offset 0 in %s on line %d
 NULL
 NULL
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,4 @@ array(3) { @@
       [2]=>
       int(3)
     }
-    Exception: Cannot declare self-referencing constant 'self::B'
+    Exception: Cannot declare self-referencing constant self::B