Migrate basic entity persister to the object API of association mapping

derrabus · Apr 21, 2023 · ade5559 · ade5559
1 parent c019f86
commit ade5559
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 113 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/AssociationMapping.php b/lib/Doctrine/ORM/Mapping/AssociationMapping.php
@@ -179,6 +179,12 @@ final public function isToMany(): bool
         return $this instanceof ToManyAssociationMapping;
     }
 
+    /** @psalm-assert-if-true OneToOneOwningSideMapping $this */
+    final public function isOneToOneOwningSide(): bool
+    {
+        return $this->isOneToOne() && $this->isOwningSide();
+    }
+
     /** @psalm-assert-if-true OneToOneOwningSideMapping|ManyToOneAssociationMapping $this */
     final public function isToOneOwningSide(): bool
     {

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -438,7 +438,7 @@ class ClassMetadata implements PersistenceClassMetadata, Stringable
      * )
      * </pre>
      *
-     * @psalm-var array<string, OneToOneAssociationMapping|ManyToOneAssociationMapping|OneToManyAssociationMapping|ManyToManyAssociationMapping>
+     * @psalm-var array<string, AssociationMapping>
      */
     public array $associationMappings = [];
 

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php
@@ -162,7 +162,7 @@ public function validateClass(ClassMetadata $class): array
             }
 
             if ($assoc->isOwningSide()) {
-                if ($assoc->isManyToMany()) {
+                if ($assoc->isManyToManyOwningSide()) {
                     $identifierColumns = $class->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
                         if (! in_array($joinColumn['referencedColumnName'], $identifierColumns, true)) {
@@ -194,7 +194,7 @@ public function validateClass(ClassMetadata $class): array
                                 "however '" . implode(', ', array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) .
                                 "' are missing.";
                     }
-                } elseif ($assoc->isToOne()) {
+                } elseif ($assoc->isToOneOwningSide()) {
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinColumns'] as $joinColumn) {
                         if (! in_array($joinColumn['referencedColumnName'], $identifierColumns, true)) {

diff --git a/lib/Doctrine/ORM/Utility/PersisterHelper.php b/lib/Doctrine/ORM/Utility/PersisterHelper.php
@@ -40,7 +40,7 @@ public static function getTypeOfField(string $fieldName, ClassMetadata $class, E
             return self::getTypeOfField($assoc['mappedBy'], $em->getClassMetadata($assoc['targetEntity']), $em);
         }
 
-        if ($assoc->isManyToMany()) {
+        if ($assoc->isManyToManyOwningSide()) {
             $joinData = $assoc['joinTable'];
         } else {
             $joinData = $assoc;

diff --git a/phpstan.neon b/phpstan.neon
@@ -30,17 +30,15 @@ parameters:
             path: lib/Doctrine/ORM/Mapping/ToOneAssociationMapping.php
 
         -
-            message: "#^Access to an undefined property .*Mapping\\:\\:\\$(joinTableColumns|relationTo(Target|Source)KeyColumns|joinTable|indexBy)\\.$#"
-            path: lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php
+            message: "#^Access to an undefined property .*Mapping\\:\\:\\$(joinColumns|joinTableColumns|(relation|source|target)To(Target|Source)KeyColumns|joinTable|indexBy)\\.$#"
+            paths:
+                - lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php
+                - lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+                - lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
+                - lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php
+                - lib/Doctrine/ORM/Query/SqlWalker.php
+                - lib/Doctrine/ORM/UnitOfWork.php
 
         -
             message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\ToOneAssociationMapping\\:\\:fromMappingArrayAndName\\(\\) should return Doctrine\\\\ORM\\\\Mapping\\\\ManyToOneAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToOneAssociationMapping but returns static\\(Doctrine\\\\ORM\\\\Mapping\\\\ToOneAssociationMapping\\)\\.$#"
             path: lib/Doctrine/ORM/Mapping/ToOneAssociationMapping.php
-
-        -
-            message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\<T of object\\>\\:\\:\\$associationMappings \\(array\\<string, Doctrine\\\\ORM\\\\Mapping\\\\ManyToManyAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\ManyToOneAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToManyAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToOneAssociationMapping\\>\\) does not accept array\\<int\\|string, Doctrine\\\\ORM\\\\Mapping\\\\AssociationMapping\\>\\.$#"
-            path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
-
-        -
-            message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\<T of object\\>\\:\\:\\$associationMappings \\(array\\<string, Doctrine\\\\ORM\\\\Mapping\\\\ManyToManyAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\ManyToOneAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToManyAssociationMapping\\|Doctrine\\\\ORM\\\\Mapping\\\\OneToOneAssociationMapping\\>\\) does not accept array\\<string, Doctrine\\\\ORM\\\\Mapping\\\\AssociationMapping\\>\\.$#"
-            path: lib/Doctrine/ORM/Mapping/ClassMetadata.php
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -737,9 +737,7 @@
       <code>array</code>
       <code><![CDATA[list<mixed>]]></code>
     </MoreSpecificReturnType>
-    <PossiblyNullArgument>
-      <code>$association</code>
-    </PossiblyNullArgument>
+    <PossiblyNullArgument/>
     <PossiblyNullReference>
       <code>getValue</code>
       <code>getValue</code>