Add backward compatibility with old Doctrine

Author: janedbal

phpstan.neon.dist

@@ -31,6 +31,17 @@ parameters:
             path: 'src/EntityPreloader.php'
         -
             message: '#internal interface Doctrine\\ORM\\Mapping\\PropertyAccessors\\PropertyAccessor#' # internal, although returned from public ClassMetadata::getPropertyAccessor
+            reportUnmatched: false # only new Doctrine
+            path: 'src/EntityPreloader.php'
+        -
+            message: '#Doctrine\\ORM\\Mapping\\PropertyAccessors\\PropertyAccessor#'
+            reportUnmatched: false # only old Doctrine
+            identifier: class.notFound
+            path: 'src/EntityPreloader.php'
+        -
+            message: '#Call to function method_exists#'
+            reportUnmatched: false # only new Doctrine
+            identifier: function.alreadyNarrowedType
             path: 'src/EntityPreloader.php'
         -
             message: '#Result of \|\| is always false#'

src/EntityPreloader.php

@@ -9,11 +9,13 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
+use ReflectionProperty;
 use function array_chunk;
 use function array_values;
 use function count;
 use function get_parent_class;
 use function is_a;
+use function method_exists;
 
 /**
  * @template E of object
@@ -120,7 +122,7 @@ private function loadProxies(
         int $maxFetchJoinSameFieldCount,
     ): array
     {
-        $identifierAccessor = $classMetadata->getSingleIdPropertyAccessor(); // e.g. Order::$id reflection
+        $identifierAccessor = $this->getSingleIdPropertyAccessor($classMetadata); // e.g. Order::$id reflection
         $identifierName = $classMetadata->getSingleIdentifierFieldName(); // e.g. 'id'
 
         if ($identifierAccessor === null) {
@@ -167,9 +169,9 @@ private function preloadToMany(
         int $maxFetchJoinSameFieldCount,
     ): array
     {
-        $sourceIdentifierAccessor = $sourceClassMetadata->getSingleIdPropertyAccessor(); // e.g. Order::$id reflection
-        $sourcePropertyAccessor = $sourceClassMetadata->getPropertyAccessor($sourcePropertyName); // e.g. Order::$items reflection
-        $targetIdentifierAccessor = $targetClassMetadata->getSingleIdPropertyAccessor();
+        $sourceIdentifierAccessor = $this->getSingleIdPropertyAccessor($sourceClassMetadata); // e.g. Order::$id reflection
+        $sourcePropertyAccessor = $this->getPropertyAccessor($sourceClassMetadata, $sourcePropertyName); // e.g. Order::$items reflection
+        $targetIdentifierAccessor = $this->getSingleIdPropertyAccessor($targetClassMetadata);
 
         if ($sourceIdentifierAccessor === null || $sourcePropertyAccessor === null || $targetIdentifierAccessor === null) {
             throw new LogicException('Doctrine should use RuntimeReflectionService which never returns null.');
@@ -250,17 +252,17 @@ private function preloadToMany(
     private function preloadOneToManyInner(
         array|ArrayAccess $associationMapping,
         ClassMetadata $sourceClassMetadata,
-        PropertyAccessor $sourceIdentifierAccessor,
+        PropertyAccessor|ReflectionProperty $sourceIdentifierAccessor,
         string $sourcePropertyName,
         ClassMetadata $targetClassMetadata,
-        PropertyAccessor $targetIdentifierAccessor,
+        PropertyAccessor|ReflectionProperty $targetIdentifierAccessor,
         array $uninitializedSourceEntityIdsChunk,
         array $uninitializedCollections,
         int $maxFetchJoinSameFieldCount,
     ): array
     {
         $targetPropertyName = $sourceClassMetadata->getAssociationMappedByTargetField($sourcePropertyName); // e.g. 'order'
-        $targetPropertyAccessor = $targetClassMetadata->getPropertyAccessor($targetPropertyName); // e.g. Item::$order reflection
+        $targetPropertyAccessor = $this->getPropertyAccessor($targetClassMetadata, $targetPropertyName); // e.g. Item::$order reflection
         $targetEntities = [];
 
         if ($targetPropertyAccessor === null) {
@@ -302,10 +304,10 @@ private function preloadOneToManyInner(
     private function preloadManyToManyInner(
         array|ArrayAccess $associationMapping,
         ClassMetadata $sourceClassMetadata,
-        PropertyAccessor $sourceIdentifierAccessor,
+        PropertyAccessor|ReflectionProperty $sourceIdentifierAccessor,
         string $sourcePropertyName,
         ClassMetadata $targetClassMetadata,
-        PropertyAccessor $targetIdentifierAccessor,
+        PropertyAccessor|ReflectionProperty $targetIdentifierAccessor,
         array $uninitializedSourceEntityIdsChunk,
         array $uninitializedCollections,
         int $maxFetchJoinSameFieldCount,
@@ -379,7 +381,7 @@ private function preloadToOne(
         int $maxFetchJoinSameFieldCount,
     ): array
     {
-        $sourcePropertyAccessor = $sourceClassMetadata->getPropertyAccessor($sourcePropertyName); // e.g. Item::$order reflection
+        $sourcePropertyAccessor = $this->getPropertyAccessor($sourceClassMetadata, $sourcePropertyName); // e.g. Item::$order reflection
 
         if ($sourcePropertyAccessor === null) {
             throw new LogicException('Doctrine should use RuntimeReflectionService which never returns null.');
@@ -483,4 +485,31 @@ private function addFetchJoinsToPreventFetchDuringHydration(
         }
     }
 
+    /**
+     * @param ClassMetadata<object> $classMetadata
+     */
+    private function getSingleIdPropertyAccessor(ClassMetadata $classMetadata): PropertyAccessor|ReflectionProperty|null
+    {
+        if (method_exists($classMetadata, 'getSingleIdPropertyAccessor')) {
+            return $classMetadata->getSingleIdPropertyAccessor();
+        }
+
+        return $classMetadata->getSingleIdReflectionProperty();
+    }
+
+    /**
+     * @param ClassMetadata<object> $classMetadata
+     */
+    private function getPropertyAccessor(
+        ClassMetadata $classMetadata,
+        string $property,
+    ): PropertyAccessor|ReflectionProperty|null
+    {
+        if (method_exists($classMetadata, 'getPropertyAccessor')) {
+            return $classMetadata->getPropertyAccessor($property);
+        }
+
+        return $classMetadata->getReflectionProperty($property);
+    }
+
 }