Merge pull request #3005 from ad3n/patch-3

Check for EntityManagerInterface in Doctrine ORM data providers

Author: soyuka

src/Bridge/Doctrine/Orm/CollectionDataProvider.php

@@ -21,6 +21,7 @@
 use ApiPlatform\Core\Exception\RuntimeException;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Collection data provider for the Doctrine ORM.
@@ -45,7 +46,7 @@ public function __construct(ManagerRegistry $managerRegistry, iterable $collecti
 
     public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
     {
-        return null !== $this->managerRegistry->getManagerForClass($resourceClass);
+        return $this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface;
     }
 
     /**

src/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -25,7 +25,6 @@
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 
@@ -56,7 +55,7 @@ public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollec
 
     public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
     {
-        return null !== $this->managerRegistry->getManagerForClass($resourceClass);
+        return $this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface;
     }
 
     /**
@@ -68,7 +67,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
     {
-        /** @var ObjectManager $manager */
+        /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
 
         if ((\is_int($id) || \is_string($id)) && !($context[IdentifierConverterInterface::HAS_IDENTIFIER_CONVERTER] ?? false)) {
@@ -83,7 +82,7 @@ public function getItem(string $resourceClass, $id, string $operationName = null
         $identifiers = $id;
 
         $fetchData = $context['fetch_data'] ?? true;
-        if (!$fetchData && $manager instanceof EntityManagerInterface) {
+        if (!$fetchData) {
             return $manager->getReference($resourceClass, $identifiers);
         }