Some review fixes

Author: kocsismate

Zend/tests/readonly_props/readonly_clone_success.phpt renamed to Zend/tests/readonly_props/readonly_clone_success1.phpt

@@ -1,74 +1,46 @@
 --TEST--
-Test that __clone() can write to readonly properties
+Test that __clone() unset and reassign properties
 --FILE--
 <?php
 
-class Counter
-{
-    private static int $counter = 0;
-
-    public readonly int $count;
-    private readonly int $foo;
-
-    public function __construct()
-    {
-        $this->count = ++self::$counter;
-        $this->foo = 0;
-    }
-
-    public function count(?int $count = null): static
-    {
-        $new = clone $this;
-        $new->count = $count ?? ++self::$counter;
-
-        return $new;
-    }
+class Foo {
+    public function __construct(
+        public readonly stdClass $bar,
+    ) {}
 
     public function __clone()
     {
-        if (is_a(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['class'] ?? '', self::class, true)) {
-            unset($this->count);
-        } else {
-            $this->count = ++self::$counter;
-        }
-        $this->foo = 1;
+        unset($this->bar);
+        var_dump($this);
+        $this->bar = new stdClass();
     }
 }
 
-$a = new Counter();
-var_dump($a);
-
-var_dump(clone $a);
-
-$b = $a->count();
-var_dump($b);
+$foo = new Foo(new stdClass());
+var_dump($foo);
+$foo2 = clone $foo;
 
-$c = $a->count(123);
-var_dump($c);
+var_dump($foo);
+var_dump($foo2);
 
 ?>
 --EXPECTF--
-object(Counter)#%d (2) {
-  ["count"]=>
-  int(1)
-  ["foo":"Counter":private]=>
-  int(0)
+object(Foo)#1 (%d) {
+  ["bar"]=>
+  object(stdClass)#2 (%d) {
+  }
 }
-object(Counter)#%d (2) {
-  ["count"]=>
-  int(2)
-  ["foo":"Counter":private]=>
-  int(1)
+object(Foo)#3 (%d) {
+  ["bar"]=>
+  uninitialized(stdClass)
 }
-object(Counter)#%d (2) {
-  ["count"]=>
-  int(3)
-  ["foo":"Counter":private]=>
-  int(1)
+object(Foo)#1 (%d) {
+  ["bar"]=>
+  object(stdClass)#2 (%d) {
+  }
 }
-object(Counter)#%d (2) {
-  ["count"]=>
-  int(123)
-  ["foo":"Counter":private]=>
-  int(1)
+object(Foo)#3 (%d) {
+  ["bar"]=>
+  object(stdClass)#4 (%d) {
+  }
 }

Zend/tests/readonly_props/readonly_clone_success2.phpt

@@ -1,33 +1,37 @@
 --TEST--
-Test that __clone() unset properties
+__clone() can indirectly modify unlocked readonly properties
 --FILE--
 <?php
 
 class Foo {
     public function __construct(
-        public readonly stdClass $bar,
+        public readonly array $bar
     ) {}
 
     public function __clone()
     {
-        unset($this->bar);
+        $this->bar['bar'] = 'bar';
     }
 }
 
-$foo = new Foo(new stdClass());
-$foo2 = clone $foo;
-
-var_dump($foo);
-var_dump($foo2);
+$foo = new Foo([]);
+// First call fills the cache slot
+var_dump(clone $foo);
+var_dump(clone $foo);
 
 ?>
 --EXPECTF--
-object(Foo)#1 (%d) {
+object(Foo)#2 (%d) {
   ["bar"]=>
-  object(stdClass)#2 (%d) {
+  array(1) {
+    ["bar"]=>
+    string(3) "bar"
   }
 }
-object(Foo)#3 (%d) {
+object(Foo)#2 (%d) {
   ["bar"]=>
-  uninitialized(stdClass)
+  array(1) {
+    ["bar"]=>
+    string(3) "bar"
+  }
 }

Zend/tests/readonly_props/readonly_clone_success3.phpt

@@ -3167,7 +3167,6 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
 							ZVAL_COPY(result, ptr);
 						} else if (Z_PROP_FLAG_P(ptr) & IS_PROP_REINITABLE) {
 							Z_PROP_FLAG_P(ptr) &= ~IS_PROP_REINITABLE;
-							ZVAL_COPY(result, ptr);
 						} else {
 							zend_readonly_property_modification_error(prop_info);
 							ZVAL_ERROR(result);