Merge branch 'PHP-8.5'

kocsismate · kocsismate · commit 30b2d77cd387 · 2026-03-20T23:30:35.000+01:00
* PHP-8.5:
  Fix replacement of class signatures when a packagesynopsis element is present
diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -5779,6 +5779,19 @@ function replaceClassSynopses(
                 continue;
             }
             $className = $child->textContent;
+
+            if ($classSynopsis->parentElement->nodeName === "packagesynopsis" &&
+                $classSynopsis->parentElement->firstElementChild->nodeName === "package"
+            ) {
+                $package = $classSynopsis->parentElement->firstElementChild;
+                $namespace = $package->textContent;
+
+                $className = $namespace . "\\" . $className;
+                $elementToReplace = $classSynopsis->parentElement;
+            } else {
+                $elementToReplace = $classSynopsis;
+            }
+
             if (!isset($classMap[$className])) {
                 continue;
             }
@@ -5794,7 +5807,7 @@ function replaceClassSynopses(
 
             // Check if there is any change - short circuit if there is not any.
 
-            if (replaceAndCompareXmls($doc, $classSynopsis, $newClassSynopsis)) {
+            if (replaceAndCompareXmls($doc, $elementToReplace, $newClassSynopsis)) {
                 continue;
             }
 
