Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix class synopsis generation

Author: kocsismate

build/gen_stub.php

@@ -1548,9 +1548,9 @@ public function getFieldSynopsisElement(DOMDocument $doc): DOMElement
         $fieldsynopsisElement->appendChild(new DOMText("\n     "));
         $fieldsynopsisElement->appendChild($this->getFieldSynopsisType()->getTypeForDoc($doc));
 
-        $className = str_replace("\\", "-", $this->name->class->toLowerString());
+        $className = str_replace(["\\", "_"], ["-", "-"], $this->name->class->toLowerString());
         $varnameElement = $doc->createElement("varname", $this->name->property);
-        $varnameElement->setAttribute("linkend", "$className.props." . strtolower($this->name->property));
+        $varnameElement->setAttribute("linkend", "$className.props." . strtolower(str_replace("_", "-", $this->name->property)));
         $fieldsynopsisElement->appendChild(new DOMText("\n     "));
         $fieldsynopsisElement->appendChild($varnameElement);
 
@@ -1566,14 +1566,14 @@ public function getFieldSynopsisElement(DOMDocument $doc): DOMElement
     }
 
     private function getFieldSynopsisType(): Type {
-        if ($this->type) {
-            return $this->type;
-        }
-
         if ($this->phpDocType) {
             return $this->phpDocType;
         }
 
+        if ($this->type) {
+            return $this->type;
+        }
+
         throw new Exception("A property must have a type");
     }
 
@@ -2013,11 +2013,11 @@ private static function createOoElement(
     }
 
     public static function getClassSynopsisFilename(Name $name): string {
-        return strtolower(implode('-', $name->parts));
+        return strtolower(str_replace("_", "-", implode('-', $name->parts)));
     }
 
     public static function getClassSynopsisReference(Name $name): string {
-        return "class." . strtolower(implode('-', $name->parts));
+        return "class." . self::getClassSynopsisFilename($name);
     }
 
     /**
@@ -2027,10 +2027,6 @@ public static function getClassSynopsisReference(Name $name): string {
      */
     private function collectInheritedMembers(array &$parentsWithInheritedProperties, array &$parentsWithInheritedMethods, array $classMap): void
     {
-        if ($this->type !== "class") {
-            return;
-        }
-
         foreach ($this->extends as $parent) {
             $parentInfo = $classMap[$parent->toString()] ?? null;
             if (!$parentInfo) {
@@ -2041,7 +2037,7 @@ private function collectInheritedMembers(array &$parentsWithInheritedProperties,
                 $parentsWithInheritedProperties[$parent->toString()] = $parent;
             }
 
-            if (!empty($parentInfo->funcInfos) && !isset($parentsWithInheritedMethods[$parent->toString()])) {
+            if (!isset($parentsWithInheritedMethods[$parent->toString()]) && $parentInfo->hasMethods()) {
                 $parentsWithInheritedMethods[$parent->toString()] = $parent;
             }
 
@@ -2998,12 +2994,14 @@ function replaceClassSynopses(string $targetDirectory, array $classMap): array
             $replacedXml = preg_replace(
                 [
                     "/REPLACED-ENTITY-([A-Za-z0-9._{}%-]+?;)/",
+                    "/<phpdoc:(classref|exceptionref)\s+xmlns:phpdoc=\"([a-z0-9.:\/]+)\"\s+xmlns=\"([a-z0-9.:\/]+)\"\s+xml:id=\"([a-z0-9._-]+)\"\s*>/i",
                     "/<phpdoc:(classref|exceptionref)\s+xmlns:phpdoc=\"([a-z0-9.:\/]+)\"\s+xmlns=\"([a-z0-9.:\/]+)\"\s+xmlns:xi=\"([a-z0-9.:\/]+)\"\s+xml:id=\"([a-z0-9._-]+)\"\s*>/i",
                     "/<phpdoc:(classref|exceptionref)\s+xmlns:phpdoc=\"([a-z0-9.:\/]+)\"\s+xmlns=\"([a-z0-9.:\/]+)\"\s+xmlns:xlink=\"([a-z0-9.:\/]+)\"\s+xmlns:xi=\"([a-z0-9.:\/]+)\"\s+xml:id=\"([a-z0-9._-]+)\"\s*>/i",
                     "/<phpdoc:(classref|exceptionref)\s+xmlns=\"([a-z0-9.:\/]+)\"\s+xmlns:xlink=\"([a-z0-9.:\/]+)\"\s+xmlns:xi=\"([a-z0-9.:\/]+)\"\s+xmlns:phpdoc=\"([a-z0-9.:\/]+)\"\s+xml:id=\"([a-z0-9._-]+)\"\s*>/i",
                 ],
                 [
                     "&$1",
+                    "<phpdoc:$1 xml:id=\"$4\" xmlns:phpdoc=\"$2\" xmlns=\"$3\">",
                     "<phpdoc:$1 xml:id=\"$5\" xmlns:phpdoc=\"$2\" xmlns=\"$3\" xmlns:xi=\"$4\">",
                     "<phpdoc:$1 xml:id=\"$6\" xmlns:phpdoc=\"$2\" xmlns=\"$3\" xmlns:xlink=\"$4\" xmlns:xi=\"$5\">",
                     "<phpdoc:$1 xml:id=\"$6\" xmlns:phpdoc=\"$5\" xmlns=\"$2\" xmlns:xlink=\"$3\" xmlns:xi=\"$4\">",