Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix various hooked object iterator issues

Author: iluuu1994

Zend/tests/property_hooks/dump.phpt

@@ -59,13 +59,21 @@ function dump($test) {
     var_dump((array) $test);
 }
 
+echo "dump(Test):\n";
 dump(new Test);
+
+echo "\n\ndump(Child):\n";
 dump(new Child);
+
+echo "\n\nChild::dumpTest():\n";
 (new Child)->dumpTest();
+
+echo "\n\nChild::dumpChild():\n";
 (new Child)->dumpChild();
 
 ?>
 --EXPECTF--
+dump(Test):
 object(Test)#%d (4) {
   ["addedHooks"]=>
   string(10) "addedHooks"
@@ -102,6 +110,9 @@ array(4) {
   ["%0Test%0changed"]=>
   string(12) "changed Test"
 }
+
+
+dump(Child):
 object(Child)#%d (5) {
   ["addedHooks"]=>
   string(10) "addedHooks"
@@ -124,11 +135,11 @@ array(3) {
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
    'private' => 'PRIVATE',
-   'changed' => 'changed Child',
+   'changed' => 'CHANGED TEST',
+   'changed' => 'CHANGED CHILD',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}
 array(5) {
@@ -143,6 +154,9 @@ array(5) {
   ["%0Child%0changed"]=>
   string(13) "changed Child"
 }
+
+
+Child::dumpTest():
 object(Child)#%d (5) {
   ["addedHooks"]=>
   string(10) "addedHooks"
@@ -155,7 +169,7 @@ object(Child)#%d (5) {
   ["changed":"Child":private]=>
   string(13) "changed Child"
 }
-array(4) {
+array(5) {
   ["addedHooks"]=>
   string(10) "ADDEDHOOKS"
   ["virtual"]=>
@@ -164,6 +178,8 @@ array(4) {
   string(6) "BACKED"
   ["private"]=>
   string(7) "PRIVATE"
+  ["changed"]=>
+  string(12) "CHANGED TEST"
 }
 array(5) {
   ["addedHooks"]=>
@@ -179,11 +195,11 @@ array(5) {
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
    'private' => 'PRIVATE',
-   'changed' => 'changed Child',
+   'changed' => 'CHANGED TEST',
+   'changed' => 'CHANGED CHILD',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}
 array(5) {
@@ -198,6 +214,9 @@ array(5) {
   ["%0Child%0changed"]=>
   string(13) "changed Child"
 }
+
+
+Child::dumpChild():
 object(Child)#%d (5) {
   ["addedHooks"]=>
   string(10) "addedHooks"
@@ -210,25 +229,23 @@ object(Child)#%d (5) {
   ["changed":"Child":private]=>
   string(13) "changed Child"
 }
-array(5) {
+array(4) {
   ["addedHooks"]=>
   string(10) "ADDEDHOOKS"
-  ["changed"]=>
-  string(13) "CHANGED CHILD"
   ["virtual"]=>
   string(7) "VIRTUAL"
   ["backed"]=>
   string(6) "BACKED"
   ["changed"]=>
-  string(13) "changed Child"
+  string(13) "CHANGED CHILD"
 }
 \Child::__set_state(array(
    'addedHooks' => 'ADDEDHOOKS',
-   'changed' => 'CHANGED CHILD',
    'virtual' => 'VIRTUAL',
    'backed' => 'BACKED',
    'private' => 'PRIVATE',
-   'changed' => 'changed Child',
+   'changed' => 'CHANGED TEST',
+   'changed' => 'CHANGED CHILD',
 ))
 {"addedHooks":"ADDEDHOOKS","virtual":"VIRTUAL","backed":"BACKED"}
 array(5) {

Zend/tests/property_hooks/foreach.phpt

@@ -86,8 +86,35 @@ testByVal(new ByVal);
 testByVal(new ByRef);
 testByRef(new ByRef);
 
+class A {
+    private $changed { get => 'A'; }
+    protected $promoted { get => 'A'; }
+    protected $protected { get => 'A'; }
+    private $shadowed = 'A';
+
+    public function test() {
+        foreach ($this as $k => $v) {
+            var_dump($k, $v);
+        }
+    }
+}
+
+#[AllowDynamicProperties]
+class B extends A {
+    public $changed { get => 'B'; }
+    public $promoted { get => 'B'; }
+}
+
+$b = new B;
+$b->shadowed = 'Global';
+$b->test();
+
 ?>
 --EXPECTF--
+plain => plain
+ByRef::$virtualByRef::get
+virtualByRef => virtualByRef
+ByRef::$virtualByRef::set
 ByVal::$virtualByVal::get
 virtualByVal => virtualByVal
 ByVal::$virtualByVal::set
@@ -97,10 +124,6 @@ ByVal::$backed::set
 ByVal::$backedUninitialized::get
 backedUninitialized => backedUninitialized
 ByVal::$backedUninitialized::set
-plain => plain
-ByRef::$virtualByRef::get
-virtualByRef => virtualByRef
-ByRef::$virtualByRef::set
 dynamic => dynamic
 object(ByVal)#%d (6) {
   ["plain"]=>
@@ -141,3 +164,11 @@ object(ByRef)#%d (3) {
   ["dynamic"]=>
   string(7) "DYNAMIC"
 }
+string(7) "changed"
+string(1) "A"
+string(8) "promoted"
+string(1) "B"
+string(9) "protected"
+string(1) "A"
+string(8) "shadowed"
+string(1) "A"

Zend/tests/property_hooks/gh16185.phpt

@@ -0,0 +1,28 @@
+--TEST--
+GH-16185: Incorrect indexing into dynamic property array
+--FILE--
+<?php
+
+class ByRef {
+    private $_virtualByRef = 'virtualByRef';
+}
+
+class ByVal extends ByRef {
+    public $_virtualByRef {
+        get => null;
+        set { $this->dynamicProp = $value; }
+    }
+}
+
+$object = new ByVal;
+foreach ($object as $value) {
+    var_dump($value);
+    $object->_virtualByRef = $value;
+}
+
+?>
+--EXPECTF--
+NULL
+
+Deprecated: Creation of dynamic property ByVal::$dynamicProp is deprecated in %s on line %d
+NULL

Zend/tests/property_hooks/gh16185_002.phpt

@@ -0,0 +1,30 @@
+--TEST--
+GH-16185: Hooked object iterator with readonly props
+--FILE--
+<?php
+
+class C {
+    public readonly int $prop;
+    public $dummy { set {} }
+
+    public function init() {
+        $this->prop = 1;
+    }
+}
+
+$c = new C;
+
+// Okay, as foreach skips over uninitialized properties.
+foreach ($c as &$prop) {}
+
+$c->init();
+
+try {
+    foreach ($c as &$prop) {}
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+Cannot acquire reference to readonly property C::$prop