Merge branch 'PHP-8.2' into PHP-8.3

NEWS

@@ -8,6 +8,10 @@ PHP                                                                        NEWS
   . Fixed OSS Fuzz #62294 (Unsetting variable after ++/-- on string variable
     warning). (Girgias)
 
+- Core:
+  . Fixed bug GH-12207 (memory leak when class using trait with doc block).
+    (rioderelfte)
+
 - Filter:
   . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)
 

Zend/tests/traits/bugs/overridding-static-property-with-doc-block.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Overriding a static property where both declarations have a doc block does not leak memory
+--FILE--
+<?php
+trait MyTrait {
+    /**
+     * trait comment
+     */
+    static $property;
+}
+
+class MyClass {
+    use MyTrait;
+
+    /**
+     * class comment
+     */
+    static $property;
+}
+?>
+--EXPECT--

Zend/zend_API.c

@@ -4332,6 +4332,9 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
 		    (property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
 			property_info->offset = property_info_ptr->offset;
 			zval_ptr_dtor(&ce->default_static_members_table[property_info->offset]);
+			if (property_info_ptr->doc_comment) {
+				zend_string_release(property_info_ptr->doc_comment);
+			}
 			zend_hash_del(&ce->properties_info, name);
 		} else {
 			property_info->offset = ce->default_static_members_count++;
@@ -4350,6 +4353,9 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
 		    (property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
 			property_info->offset = property_info_ptr->offset;
 			zval_ptr_dtor(&ce->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
+			if (property_info_ptr->doc_comment) {
+				zend_string_release_ex(property_info_ptr->doc_comment, 1);
+			}
 			zend_hash_del(&ce->properties_info, name);
 
 			ZEND_ASSERT(ce->type == ZEND_INTERNAL_CLASS);