Fix psalm errors

malarzm · Mar 27, 2024 · 18f9828 · 18f9828
1 parent 339f618
commit 18f9828
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -1845,7 +1845,7 @@ public function getFieldMapping(string $fieldName): array
     /**
      * Gets mappings of fields holding embedded document(s).
      *
-     * @psalm-return array<string, FieldMapping>
+     * @psalm-return array<string, AssociationFieldMapping>
      */
     public function getEmbeddedFieldsMappings(): array
     {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -925,6 +925,16 @@ parameters:
 			count: 1
 			path: tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php
 
+		-
+			message: "#^Property Doctrine\\\\ODM\\\\MongoDB\\\\Tests\\\\Mapping\\\\MappedSuperclassRelated1\\:\\:\\$id is unused\\.$#"
+			count: 1
+			path: tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php
+
+		-
+			message: "#^Property Doctrine\\\\ODM\\\\MongoDB\\\\Tests\\\\Mapping\\\\MappedSuperclassRelated1\\:\\:\\$name is unused\\.$#"
+			count: 1
+			path: tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php
+
 		-
 			message: "#^Property Doctrine\\\\ODM\\\\MongoDB\\\\Tests\\\\Mapping\\\\TransientBaseClass\\:\\:\\$transient1 is unused\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php">
     <MissingTemplateParam>
       <code><![CDATA[IteratorAggregate]]></code>
@@ -60,14 +60,9 @@
     </InvalidPropertyAssignmentValue>
     <InvalidReturnStatement>
       <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[array_filter(
-            $this->associationMappings,
-            static fn ($assoc) => ! empty($assoc['embedded'])
-        )]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code><![CDATA[FieldMapping]]></code>
-      <code><![CDATA[array<string, FieldMapping>]]></code>
     </InvalidReturnType>
     <LessSpecificImplementedReturnType>
       <code><![CDATA[array]]></code>
@@ -305,11 +300,6 @@
       <code><![CDATA[empty($divided[$class->name])]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/OperatorTest.php">
-    <InternalClass>
-      <code><![CDATA[Operator]]></code>
-    </InternalClass>
-  </file>
   <file src="tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/UnsetTest.php">
     <InvalidArgument>
       <code><![CDATA[$documentPersister]]></code>

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php
@@ -8,7 +8,6 @@
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
-use Doctrine\ODM\MongoDB\Tests\Functional\MappedSuperclassRelated1;
 
 use function serialize;
 use function unserialize;
@@ -132,6 +131,18 @@ class MappedSuperclassBase
     private $transient;
 }
 
+#[ODM\Document]
+class MappedSuperclassRelated1
+{
+    /** @var int|null */
+    #[ODM\Id(strategy: 'none')]
+    private $id;
+
+    /** @var string|null */
+    #[ODM\Field(type: 'string')]
+    private $name;
+}
+
 #[ODM\Document]
 class DocumentSubClass2 extends MappedSuperclassBase
 {