Address some review comments

Author: kocsismate

Zend/tests/final_properties/access/lazy_initialization.phpt

@@ -0,0 +1,64 @@
+--TEST--
+Test that final properties can be initialized lazily by unsetting them and using __get()
+--FILE--
+<?php
+
+class Foo
+{
+    final public int $property1;
+    final public string $property2;
+    final public stdClass $property3;
+}
+
+class Bar extends Foo
+{
+    private $lazyProperty1;
+    private $lazyProperty2;
+    private $lazyProperty3;
+
+    public function __construct()
+    {
+        unset($this->property1);
+        unset($this->property2);
+        unset($this->property3);
+    }
+
+    public function __get($name)
+    {
+        switch ($name) {
+            case "property1":
+                if ($this->lazyProperty1 === null) {
+                    $this->lazyProperty1 = 1;
+                }
+
+                return $this->lazyProperty1;
+            case "property2":
+                if ($this->lazyProperty2 === null) {
+                    $this->lazyProperty2 = "foo";
+                }
+
+                return $this->lazyProperty2;
+            case "property3":
+                 if ($this->lazyProperty3 === null) {
+                     $this->lazyProperty3 = new stdClass();
+                 }
+
+                 return $this->lazyProperty3;
+            default:
+                throw new Exception();
+        }
+    }
+}
+
+$foo = new Bar();
+
+var_dump($foo->property1);
+var_dump($foo->property2);
+var_dump($foo->property3);
+
+?>
+--EXPECT--
+int(1)
+string(3) "foo"
+object(stdClass)#2 (0) {
+}

Zend/tests/final_properties/access/property_by_ref_access.phpt renamed to Zend/tests/final_properties/access/property_by_ref_access1.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Test that declared final properties can't be accessed by reference
+--FILE--
+<?php
+
+class Foo
+{
+    final public int $property1;
+    final public int $property2 = 2;
+
+    public function __construct()
+    {
+        $this->property1 = 1;
+    }
+}
+
+$foo = new Foo();
+
+try {
+    foreach ($foo as &$property) {}
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Cannot acquire reference on final property Foo::$property1

Zend/tests/final_properties/access/property_by_ref_access2.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test that final properties can't be modified after cloning
+Test that initialized final properties can't be modified after cloning
 --FILE--
 <?php
 

Zend/tests/final_properties/access/property_incrementing_decrementing_by_ref.phpt

@@ -6,11 +6,12 @@ Test that final properties can be cloned
 class Foo
 {
     final public int $property1;
-    final public string $property2 = "";
+    final public int $property2;
+    final public string $property3 = "";
 }
 
 $foo = new Foo();
-$foo->property1 = 1;
+$foo->property2 = 2;
 var_dump($foo);
 $bar = clone $foo;
 var_dump($bar);
@@ -19,13 +20,17 @@ var_dump($bar);
 --EXPECTF--
 object(Foo)#1 (2) {
   ["property1"]=>
-  int(1)
+  uninitialized(int)
   ["property2"]=>
+  int(2)
+  ["property3"]=>
   string(0) ""
 }
 object(Foo)#2 (2) {
   ["property1"]=>
-  int(1)
+  uninitialized(int)
   ["property2"]=>
+  int(2)
+  ["property3"]=>
   string(0) ""
 }

Zend/tests/final_properties/access/property_mutation_by_ref1.phpt renamed to Zend/tests/final_properties/access/property_mutation_by_ref.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Test that uninitialized final properties can be initialized after cloning
+--FILE--
+<?php
+
+class Foo
+{
+    final public int $property1;
+}
+
+$foo = new Foo();
+var_dump($foo);
+$bar = clone $foo;
+$bar->property1 = 1;
+var_dump($bar);
+
+?>
+--EXPECTF--
+object(Foo)#1 (0) {
+  ["property1"]=>
+  uninitialized(int)
+}
+object(Foo)#2 (1) {
+  ["property1"]=>
+  int(1)
+}

Zend/tests/final_properties/access/property_mutation_by_ref2.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Test that non-private final properties can't override non-final properties
+--FILE--
+<?php
+
+class Foo
+{
+    protected int $property1;
+}
+
+class Bar extends Foo
+{
+    final protected int $property1;
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare non-final property Foo::$property1 as final Bar::$property1 in %s on line %d

Zend/tests/final_properties/clone/clone_error.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Test that non-private final static properties can't override non-final static properties
+--FILE--
+<?php
+
+class Foo
+{
+    protected static int $property1;
+}
+
+class Bar extends Foo
+{
+    final protected static int $property1;
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare non-final property Foo::$property1 as final Bar::$property1 in %s on line %d

Zend/tests/final_properties/clone/clone_success.phpt renamed to Zend/tests/final_properties/clone/clone_success1.phpt

@@ -1,18 +1,24 @@
 --TEST--
-Test that final properties can be overwritten by non-final properties
+Test that non-final properties can override final properties
 --FILE--
 <?php
 
 class Foo
 {
-    final protected static int $property1;
-    final protected int $property2;
+    final private static int $property1;
+    final private int $property2;
+
+    final protected static int $property3;
+    final protected int $property4;
 }
 
 class Bar extends Foo
 {
-    protected static int $property1;
-    protected int $property2;
+    final private static int $property1;
+    final private int $property2;
+
+    protected static int $property3;
+    protected int $property4;
 }
 
 ?>

Zend/tests/final_properties/clone/clone_success2.phpt

@@ -1,18 +1,18 @@
 --TEST--
-Test that non-final properties can be overwritten by final properties
+Test that private final properties can override non-final properties
 --FILE--
 <?php
 
 class Foo
 {
-    protected static int $property1;
-    protected int $property2;
+    private static int $property1;
+    private int $property2;
 }
 
 class Bar extends Foo
 {
-    final protected static int $property1;
-    final protected int $property2;
+    final private static int $property1;
+    final private int $property2;
 }
 
 ?>

Zend/tests/final_properties/inheritance/inheritance_error.phpt

@@ -23,7 +23,6 @@ try {
     echo $exception->getMessage() . "\n";
 }
 
-// Uninitialized typed properties can't be unset
 unset($foo->property2);
 unset($foo->property2);