Merge branch 'master' into zend-ini-get-addr-void

Author: TimWolla

.gitattributes

@@ -21,6 +21,7 @@
 
 # Collapse generated files within git and pull request diff.
 **/*_arginfo.h linguist-generated -diff
+**/*_decl.h linguist-generated -diff
 /main/debug_gdb_scripts.c linguist-generated -diff
 /Zend/zend_vm_execute.h linguist-generated -diff
 /Zend/zend_vm_handlers.h linguist-generated -diff

.github/actions/brew/action.yml

@@ -13,11 +13,18 @@ runs:
 
         # Some packages exist on x86 but not arm, or vice versa.
         # Install them with reinstall to avoid warnings.
-        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl
-        brew install \
+        brew reinstall -v \
+          autoconf \
+          webp \
+          tidy-html5 \
+          libzip \
+          libsodium \
+          icu4c \
+          curl
+        brew install -v \
           bison \
           re2c
-        brew install \
+        brew install -v \
           bzip2 \
           enchant \
           libffi \

.github/workflows/nightly.yml

@@ -363,6 +363,7 @@ jobs:
       - name: Update clang
         uses: ./.github/actions/macos-update-clang
       - name: brew
+        timeout-minutes: 10
         uses: ./.github/actions/brew
       - name: ./configure
         uses: ./.github/actions/configure-macos

.github/workflows/push.yml

@@ -242,6 +242,7 @@ jobs:
       - name: Update clang
         uses: ./.github/actions/macos-update-clang
       - name: brew
+        timeout-minutes: 10
         uses: ./.github/actions/brew
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2

NEWS

@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed GH-20564 (Don't call autoloaders with pending exception). (ilutov)
   . Fix deprecation now showing when accessing null key of an array with JIT.
     (alexandre-daubois)
+  . Fixed bug GH-20174 (Assertion failure in
+    ReflectionProperty::skipLazyInitialization after failed LazyProxy
+    initialization). (Arnaud)
 
 - Date:
   . Update timelib to 2022.16. (Derick)

UPGRADING.INTERNALS

@@ -60,11 +60,20 @@ PHP 8.6 INTERNALS UPGRADE NOTES
     automatically unwrap references when the result of the call is stored in an
     IS_TMP_VAR variable. This may be achieved by calling the
     zend_return_unwrap_ref() function.
+  . The php_math_round_mode_from_enum() function now takes a
+    zend_enum_RoundingMode parameter.
+  . Added Z_PARAM_ENUM().
+  . Added zend_enum_fetch_case_id().
 
 ========================
 2. Build system changes
 ========================
 
+  . build/gen_stub.php may now generate a _decl.h file in addition to
+    the _arginfo.h file, if the stub declares enums and is annotated with
+    @generate-c-enums. For each enum the file will contain a C enum. Enum values
+    can be compared to the result of zend_enum_fetch_case_id(zend_object*).
+
 ========================
 3. Module changes
 ========================

Zend/tests/lazy_objects/gh20174.phpt

@@ -0,0 +1,33 @@
+--TEST--
+GH-20174: Assertion failure in ReflectionProperty::skipLazyInitialization after failed LazyProxy skipLazyInitialization
+--CREDITS--
+vi3tL0u1s
+--FILE--
+<?php
+
+class C {
+    public $b;
+    public $c;
+}
+
+$reflector = new ReflectionClass(C::class);
+
+$obj = $reflector->newLazyProxy(function ($obj) {
+    $obj->b = 4;
+    throw new Exception();
+});
+
+try {
+    $reflector->initializeLazyObject($obj);
+} catch (Exception $e) {
+    $reflector->getProperty('b')->skipLazyInitialization($obj);
+}
+
+var_dump($obj);
+
+?>
+--EXPECTF--
+lazy proxy object(C)#%d (1) {
+  ["b"]=>
+  NULL
+}

Zend/tests/lazy_objects/gh20504-001.phpt

@@ -0,0 +1,24 @@
+--TEST--
+GH-20504: Assertion failure in zend_get_property_guard() when lazy proxy adds magic method - isset
+--CREDITS--
+vi3tL0u1s
+--FILE--
+<?php
+
+class RealInstance {
+    public $_;
+}
+class Proxy extends RealInstance {
+    public function __isset($name) {
+        return isset($this->$name['']);
+    }
+}
+$rc = new ReflectionClass(Proxy::class);
+$obj = $rc->newLazyProxy(function () {
+    return new RealInstance;
+});
+var_dump(isset($obj->name['']));
+
+?>
+--EXPECT--
+bool(false)

Zend/tests/lazy_objects/gh20504-002.phpt

@@ -0,0 +1,23 @@
+--TEST--
+GH-20504: Assertion failure in zend_get_property_guard() when lazy proxy adds magic method - get
+--FILE--
+<?php
+
+class RealInstance {
+    public $_;
+}
+class Proxy extends RealInstance {
+    public function __get($name) {
+        return $this->$name;
+    }
+}
+$rc = new ReflectionClass(Proxy::class);
+$obj = $rc->newLazyProxy(function () {
+    return new RealInstance;
+});
+var_dump($obj->name);
+
+?>
+--EXPECTF--
+Warning: Undefined property: RealInstance::$name in %s on line %d
+NULL

Zend/tests/lazy_objects/gh20504-003.phpt

@@ -0,0 +1,33 @@
+--TEST--
+GH-20504: Assertion failure in zend_get_property_guard() when lazy proxy adds magic method - set
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+class RealInstance {
+    public $_;
+}
+class Proxy extends RealInstance {
+    public function __set($name, $value) {
+        $this->$name = $value;
+    }
+}
+$rc = new ReflectionClass(Proxy::class);
+$obj = $rc->newLazyProxy(function () {
+    return new RealInstance;
+});
+$obj->name = 0;
+
+var_dump($obj);
+
+?>
+--EXPECTF--
+lazy proxy object(Proxy)#%d (1) {
+  ["instance"]=>
+  object(RealInstance)#%d (2) {
+    ["_"]=>
+    NULL
+    ["name"]=>
+    int(0)
+  }
+}