Merge pull request #11301 from doctrine/2.18.x

Merge 2.18.x up into 2.19.x
doctrine · Feb 24, 2024 · 7797811 · 7797811
2 parents c9c493b + 76c4539
commit 7797811
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -170,11 +170,6 @@ parameters:
 			count: 2
 			path: src/Mapping/ClassMetadataFactory.php
 
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\:\\:fullyQualifiedClassName\\(\\) should return class\\-string\\|null but returns string\\|null\\.$#"
-			count: 1
-			path: src/Mapping/ClassMetadataInfo.php
-
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\NamingStrategy\\:\\:joinColumnName\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 2

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -607,7 +607,6 @@
     <InvalidPropertyAssignmentValue>
       <code>$definition</code>
       <code><![CDATA[$this->sqlResultSetMappings]]></code>
-      <code><![CDATA[$this->subClasses]]></code>
     </InvalidPropertyAssignmentValue>
     <InvalidReturnStatement>
       <code>$mapping</code>
@@ -618,16 +617,12 @@
       <code>getReflectionClass</code>
     </InvalidReturnType>
     <LessSpecificReturnStatement>
-      <code>$className</code>
-      <code>$className</code>
       <code>$columnNames</code>
       <code>$mapping</code>
       <code>$quotedColumnNames</code>
-      <code><![CDATA[$this->namespace . '\\' . $className]]></code>
     </LessSpecificReturnStatement>
     <MoreSpecificReturnType>
       <code>FieldMapping</code>
-      <code>class-string|null</code>
       <code><![CDATA[list<string>]]></code>
       <code><![CDATA[list<string>]]></code>
     </MoreSpecificReturnType>

diff --git a/src/Mapping/ClassMetadataInfo.php b/src/Mapping/ClassMetadataInfo.php
@@ -3707,7 +3707,6 @@ public function getAssociationsByTargetClass($targetClass)
      * @param string|null $className
      *
      * @return string|null null if the input value is null
-     * @psalm-return class-string|null
      */
     public function fullyQualifiedClassName($className)
     {