Merge pull request #11302 from greg0ire/3.0.x

Merge 2.18.x up into 3.0.x

Author: greg0ire

phpstan-baseline.neon

@@ -125,11 +125,6 @@ parameters:
 			count: 1
 			path: src/EntityRepository.php
 
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\:\\:fullyQualifiedClassName\\(\\) should return class\\-string\\|null but returns string\\|null\\.$#"
-			count: 1
-			path: src/Mapping/ClassMetadata.php
-
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1

psalm-baseline.xml

@@ -314,16 +314,7 @@
     </InvalidNullableReturnType>
     <InvalidPropertyAssignmentValue>
       <code>$definition</code>
-      <code><![CDATA[$this->subClasses]]></code>
     </InvalidPropertyAssignmentValue>
-    <LessSpecificReturnStatement>
-      <code>$className</code>
-      <code>$className</code>
-      <code><![CDATA[$this->namespace . '\\' . $className]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code>class-string|null</code>
-    </MoreSpecificReturnType>
     <NullableReturnStatement>
       <code><![CDATA[$this->reflClass]]></code>
     </NullableReturnStatement>

src/Mapping/ClassMetadata.php

@@ -2464,10 +2464,7 @@ public function getAssociationMappedByTargetField(string $assocName): string
         return $assoc->mappedBy;
     }
 
-    /**
-     * @return string|null null if the input value is null
-     * @psalm-return class-string|null
-     */
+    /** @return string|null null if the input value is null */
     public function fullyQualifiedClassName(string|null $className): string|null
     {
         if (empty($className)) {