Add some tests for serialization

Author: kocsismate

Zend/tests/final_properties/access/property_assignment_combined1.phpt

@@ -71,6 +71,7 @@ try {
     echo $exception->getMessage() . "\n";
 }
 
+// $property2 must be initialized to null, otherwise the subsequent ??= would do nothing
 $foo->property2 ??= null;
 
 try {

Zend/tests/final_properties/access/property_assignment_combined2.phpt

@@ -71,6 +71,7 @@ try {
     echo $exception->getMessage() . "\n";
 }
 
+// $property2 must be initialized to null, otherwise the subsequent ??= would do nothing
 Foo::$property2 ??= null;
 
 try {

Zend/tests/final_properties/access/property_pass_by_ref.phpt renamed to Zend/tests/final_properties/access/property_pass_by_ref1.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test that final properties can't be passed by ref
+Test that final properties can't be passed by reference
 --XFAIL--
 Incorrect error message in case of static properties ("Cannot modify final static property ...")
 --FILE--
@@ -42,6 +42,6 @@ try {
 ?>
 --EXPECT--
 Cannot acquire reference to final property Foo::$property1
+Cannot acquire reference to final property Foo::$property1
+Cannot acquire reference to final property Foo::$property2
 Cannot acquire reference to final property Foo::$property2
-Cannot acquire reference to final property Foo::$property3
-Cannot acquire reference to final property Foo::$property4

Zend/tests/final_properties/access/property_pass_by_ref2.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Test that final properties can't be passed by reference
+--FILE--
+<?php
+
+class Foo
+{
+    final public array $property1 = ["field" => "abc"];
+    final public static array $property2 = ["field" => "abc"];
+}
+
+$foo = new Foo();
+
+try {
+    preg_match("/a/", "b", $foo->property1["field"]);
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    sort($foo->property1["field"]);
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    preg_match("/a/", "a", Foo::$property2["field"]);
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    sort(Foo::$property2["field"]);
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Cannot modify final property Foo::$property1 after initialization
+Cannot modify final property Foo::$property1 after initialization
+Cannot modify final static property Foo::$property2 after initialization
+Cannot modify final static property Foo::$property2 after initialization

Zend/tests/final_properties/serialization/unserialize_error1.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test that final properties can only be assigned to once during unserialization
+--XFAIL--
+Doesn't work yet.
+--FILE--
+<?php
+
+class MyClass
+{
+    final public int $finalProp;
+}
+
+var_dump(unserialize('O:7:"MyClass":2:{s:9:"finalProp";i:2;s:9:"finalProp";i:3;}'));
+
+?>
+--EXPECT--
+Cannot modify final property Foo::$finalProp after initialization

Zend/tests/final_properties/serialization/unserialize_error2.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test that final properties cannot be modified even when they were serialized as non-final
+--XFAIL--
+Doesn't work yet
+--FILE--
+<?php
+
+class MyClass
+{
+    final public int $finalProp = 1;
+}
+
+$foo = unserialize('O:7:"MyClass":2:{s:9:"finalProp";i:2;s:7:"refProp";R:2;}');
+
+$foo->refProp = 4;
+var_dump($foo->finalProp);
+
+?>
+--EXPECT--
+int(2)

Zend/tests/final_properties/serialization/unserialize_success1.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Test that final properties can be serialized and then unserialized
+--FILE--
+<?php
+
+class Foo
+{
+    final public int $property1;
+    final public string $property2 = "";
+}
+
+$foo = new Foo();
+
+var_dump(unserialize(serialize($foo)));
+
+?>
+--EXPECT--
+object(Foo)#2 (1) {
+  ["property1"]=>
+  uninitialized(int)
+  ["property2"]=>
+  string(0) ""
+}

Zend/tests/final_properties/serialization/unserialize_success2.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test that final properties can be unserialized even when they were serialized as non-final
+--FILE--
+<?php
+
+class MyClass
+{
+    final public int $finalProp = 1;
+}
+
+var_dump(unserialize('O:7:"MyClass":2:{s:9:"finalProp";i:2;s:7:"refProp";R:2;}'));
+
+?>
+--EXPECT--
+object(MyClass)#1 (2) {
+  ["finalProp"]=>
+  &int(2)
+  ["refProp"]=>
+  &int(2)
+}

Zend/zend_object_handlers.c

@@ -819,7 +819,7 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 		variable_ptr = OBJ_PROP(zobj, property_offset);
 
 		if (Z_TYPE_P(variable_ptr) != IS_UNDEF) {
-			if (UNEXPECTED(Z_PROP_FLAG_P(variable_ptr) != IS_PROP_UNINIT && prop_info && prop_info->flags & ZEND_ACC_FINAL)) {
+			if (UNEXPECTED(prop_info && prop_info->flags & ZEND_ACC_FINAL && Z_PROP_FLAG_P(variable_ptr) != IS_PROP_UNINIT)) {
 				zend_final_property_assignment_error(zobj->ce, name);
 				variable_ptr = &EG(error_zval);
 				goto exit;