[pull] master from php:master

.github/actions/setup-mssql/action.yml

@@ -11,4 +11,4 @@ runs:
           -p 1433:1433 \
           --name sql1 \
           -h sql1 \
-          -d mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
+          -d mcr.microsoft.com/mssql/server:2025-latest

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ on:
       - docs/**
 jobs:
   pages:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       pages: write
       id-token: write

.github/workflows/nightly.yml

@@ -429,7 +429,7 @@ jobs:
           FIREBIRD_DATABASE: test.fdb
           FIREBIRD_USER: test
           FIREBIRD_PASSWORD: test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: git checkout
         uses: actions/checkout@v6
@@ -862,7 +862,7 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   PECL:
     if: inputs.branch == 'master'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       CC: ccache gcc
       CXX: ccache g++
@@ -909,6 +909,8 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             ccache \
             libmemcached-dev \
+            imagemagick \
+            libmagickwand-dev \
             bison \
             re2c
       - name: ccache

Zend/zend_language_parser.y

@@ -379,7 +379,7 @@ attribute_group:
 ;
 
 attribute:
-		T_ATTRIBUTE attribute_group possible_comma ']'	{ $$ = $2; }
+		T_ATTRIBUTE backup_doc_comment attribute_group possible_comma ']'	{ $$ = $3; CG(doc_comment) = $2; }
 ;
 
 attributes:

ext/date/php_date.c

@@ -4063,7 +4063,7 @@ PHP_METHOD(DateTimeZone, __construct)
 }
 /* }}} */
 
-static bool php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, const HashTable *myht) /* {{{ */
+static bool php_date_timezone_initialize_from_hash(php_timezone_obj **tzobj, const HashTable *myht) /* {{{ */
 {
 	zval            *z_timezone_type;
 
@@ -4104,7 +4104,7 @@ PHP_METHOD(DateTimeZone, __set_state)
 
 	php_date_instantiate(date_ce_timezone, return_value);
 	tzobj = Z_PHPTIMEZONE_P(return_value);
-	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
+	if (!php_date_timezone_initialize_from_hash(&tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
 		RETURN_THROWS();
 	}
@@ -4124,7 +4124,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
 
 	myht = Z_OBJPROP_P(object);
 
-	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
+	if (!php_date_timezone_initialize_from_hash(&tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
 		RETURN_THROWS();
 	}
@@ -4188,7 +4188,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
 
 	tzobj = Z_PHPTIMEZONE_P(object);
 
-	if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
+	if (!php_date_timezone_initialize_from_hash(&tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
 		RETURN_THROWS();
 	}
@@ -4613,7 +4613,7 @@ PHP_METHOD(DateInterval, __construct)
 }
 /* }}} */
 
-static void php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, const HashTable *myht) /* {{{ */
+static void php_date_interval_initialize_from_hash(php_interval_obj *intobj, const HashTable *myht) /* {{{ */
 {
 	/* If we have a date_string, use that instead */
 	const zval *date_str = zend_hash_str_find(myht, "date_string", strlen("date_string"));
@@ -4635,15 +4635,15 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
 		}
 
 		/* If ->diff is already set, then we need to free it first */
-		if ((*intobj)->diff) {
-			timelib_rel_time_dtor((*intobj)->diff);
+		if (intobj->diff) {
+			timelib_rel_time_dtor(intobj->diff);
 		}
 
-		(*intobj)->diff = timelib_rel_time_clone(&time->relative);
-		(*intobj)->initialized = true;
-		(*intobj)->civil_or_wall = PHP_DATE_CIVIL;
-		(*intobj)->from_string = true;
-		(*intobj)->date_string = zend_string_copy(Z_STR_P(date_str));
+		intobj->diff = timelib_rel_time_clone(&time->relative);
+		intobj->initialized = true;
+		intobj->civil_or_wall = PHP_DATE_CIVIL;
+		intobj->from_string = true;
+		intobj->date_string = zend_string_copy(Z_STR_P(date_str));
 
 		timelib_time_dtor(time);
 		timelib_error_container_dtor(err);
@@ -4652,20 +4652,20 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
 	}
 
 	/* If ->diff is already set, then we need to free it first */
-	if ((*intobj)->diff) {
-		timelib_rel_time_dtor((*intobj)->diff);
+	if (intobj->diff) {
+		timelib_rel_time_dtor(intobj->diff);
 	}
 
 	/* Set new value */
-	(*intobj)->diff = timelib_rel_time_ctor();
+	intobj->diff = timelib_rel_time_ctor();
 
 #define PHP_DATE_INTERVAL_READ_PROPERTY(element, member, itype, def) \
 	do { \
 		zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \
 		if (z_arg && Z_TYPE_P(z_arg) <= IS_STRING) { \
-			(*intobj)->diff->member = (itype)zval_get_long(z_arg); \
+			intobj->diff->member = (itype)zval_get_long(z_arg); \
 		} else { \
-			(*intobj)->diff->member = (itype)def; \
+			intobj->diff->member = (itype)def; \
 		} \
 	} while (0);
 
@@ -4675,35 +4675,35 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
 		if (z_arg && Z_TYPE_P(z_arg) <= IS_STRING) { \
 			zend_string *tmp_str; \
 			zend_string *str = zval_get_tmp_string(z_arg, &tmp_str); \
-			DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \
+			DATE_A64I(intobj->diff->member, ZSTR_VAL(str)); \
 			zend_tmp_string_release(tmp_str); \
 		} else { \
-			(*intobj)->diff->member = -1LL; \
+			intobj->diff->member = -1LL; \
 		} \
 	} while (0);
 
 #define PHP_DATE_INTERVAL_READ_PROPERTY_DAYS(member) \
 	do { \
 		zval *z_arg = zend_hash_str_find(myht, "days", sizeof("days") - 1); \
 		if (z_arg && Z_TYPE_P(z_arg) == IS_FALSE) { \
-			(*intobj)->diff->member = TIMELIB_UNSET; \
+			intobj->diff->member = TIMELIB_UNSET; \
 		} else if (z_arg && Z_TYPE_P(z_arg) <= IS_STRING) { \
 			zend_string *tmp_str; \
 			zend_string *str = zval_get_tmp_string(z_arg, &tmp_str); \
-			DATE_A64I((*intobj)->diff->member, ZSTR_VAL(str)); \
+			DATE_A64I(intobj->diff->member, ZSTR_VAL(str)); \
 			zend_tmp_string_release(tmp_str); \
 		} else { \
-			(*intobj)->diff->member = -1LL; \
+			intobj->diff->member = -1LL; \
 		} \
 	} while (0);
 
 #define PHP_DATE_INTERVAL_READ_PROPERTY_DOUBLE(element, member, def) \
 	do { \
 		zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \
 		if (z_arg) { \
-			(*intobj)->diff->member = (double)zval_get_double(z_arg); \
+			intobj->diff->member = (double)zval_get_double(z_arg); \
 		} else { \
-			(*intobj)->diff->member = (double)def; \
+			intobj->diff->member = (double)def; \
 		} \
 	} while (0);
 
@@ -4716,7 +4716,7 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
 	{
 		const zval *z_arg = zend_hash_str_find(myht, "f", sizeof("f") - 1);
 		if (z_arg) {
-			(*intobj)->diff->us = zend_dval_to_lval(zval_get_double(z_arg) * 1000000.0);
+			intobj->diff->us = zend_dval_to_lval(zval_get_double(z_arg) * 1000000.0);
 		}
 	}
 	PHP_DATE_INTERVAL_READ_PROPERTY("weekday", weekday, int, -1)
@@ -4730,14 +4730,14 @@ static void php_date_interval_initialize_from_hash(zval **return_value, php_inte
 	PHP_DATE_INTERVAL_READ_PROPERTY("have_special_relative", have_special_relative, unsigned int, 0);
 	{
 		const zval *z_arg = zend_hash_str_find(myht, "civil_or_wall", sizeof("civil_or_wall") - 1);
-		(*intobj)->civil_or_wall = PHP_DATE_CIVIL;
+		intobj->civil_or_wall = PHP_DATE_CIVIL;
 		if (z_arg) {
 			zend_long val = zval_get_long(z_arg);
-			(*intobj)->civil_or_wall = val;
+			intobj->civil_or_wall = val;
 		}
 	}
 
-	(*intobj)->initialized = true;
+	intobj->initialized = true;
 } /* }}} */
 
 /* {{{ */
@@ -4752,7 +4752,7 @@ PHP_METHOD(DateInterval, __set_state)
 
 	php_date_instantiate(date_ce_interval, return_value);
 	intobj = Z_PHPINTERVAL_P(return_value);
-	php_date_interval_initialize_from_hash(&return_value, &intobj, myht);
+	php_date_interval_initialize_from_hash(intobj, myht);
 }
 /* }}} */
 
@@ -4823,7 +4823,7 @@ PHP_METHOD(DateInterval, __unserialize)
 
 	intervalobj = Z_PHPINTERVAL_P(object);
 
-	php_date_interval_initialize_from_hash(&object, &intervalobj, myht);
+	php_date_interval_initialize_from_hash(intervalobj, myht);
 	restore_custom_dateinterval_properties(object, myht);
 }
 /* }}} */
@@ -4841,7 +4841,7 @@ PHP_METHOD(DateInterval, __wakeup)
 
 	myht = Z_OBJPROP_P(object);
 
-	php_date_interval_initialize_from_hash(&return_value, &intobj, myht);
+	php_date_interval_initialize_from_hash(intobj, myht);
 }
 /* }}} */
 

ext/reflection/tests/gh20895.phpt

@@ -0,0 +1,108 @@
+--TEST--
+GH-20895: ReflectionProperty does not return the PHPDoc of a property if it contains an attribute with a Closure
+--FILE--
+<?php
+
+/** Foo */
+#[Attr(
+    /** Closure 1 */
+    static function() { },
+    /** Closure 2 */
+    static function() { },
+)]
+class Foo {
+    /** Foo::$bar */
+    #[Attr(
+        /** Closure 3 */
+        static function() { },
+        /** Closure 4 */
+        static function() { },
+    )]
+    #[Attr(
+        /** Closure 5 */
+        static function() { },
+    )]
+    public $bar;
+
+    /** Foo::bar() */
+    #[Attr(
+        /** Closure 6 */
+        static function() { },
+    )]
+    public function bar() { }
+}
+
+/** foo() */
+#[Attr(
+    /** Closure 7 */
+    static function() { },
+)]
+function foo() { }
+
+#[Attr(
+    /** Closure 8 */
+    static function() { },
+)]
+/** bar() */
+function bar() { }
+
+/** baz() */
+#[Attr(
+    static function() { },
+)]
+function baz() { }
+
+var_dump((new ReflectionClass(Foo::class))->getDocComment());
+foreach ((new ReflectionClass(Foo::class))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+var_dump((new ReflectionProperty(Foo::class, 'bar'))->getDocComment());
+foreach ((new ReflectionProperty(Foo::class, 'bar'))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+var_dump((new ReflectionMethod(Foo::class, 'bar'))->getDocComment());
+foreach ((new ReflectionMethod(Foo::class, 'bar'))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+var_dump((new ReflectionFunction('foo'))->getDocComment());
+foreach ((new ReflectionFunction('foo'))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+var_dump((new ReflectionFunction('bar'))->getDocComment());
+foreach ((new ReflectionFunction('bar'))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+var_dump((new ReflectionFunction('baz'))->getDocComment());
+foreach ((new ReflectionFunction('baz'))->getAttributes() as $attribute) {
+    foreach ($attribute->getArguments() as $argument) {
+        var_dump((new ReflectionFunction($argument))->getDocComment());
+    }
+}
+
+?>
+--EXPECT--
+string(10) "/** Foo */"
+string(16) "/** Closure 1 */"
+string(16) "/** Closure 2 */"
+string(16) "/** Foo::$bar */"
+string(16) "/** Closure 3 */"
+string(16) "/** Closure 4 */"
+string(16) "/** Closure 5 */"
+string(17) "/** Foo::bar() */"
+string(16) "/** Closure 6 */"
+string(12) "/** foo() */"
+string(16) "/** Closure 7 */"
+string(12) "/** bar() */"
+string(16) "/** Closure 8 */"
+string(12) "/** baz() */"
+bool(false)