Fix quality issues in DoctrineIdentifierLoader

Author: dunglas

Mapping/Loader/AttributesLoader.php

@@ -166,7 +166,7 @@ public function loadClassMetadata(
      *
      * @param ClassMetadata $classMetadata
      * @param string        $attributeName
-     * @param string[]|null $normalizationGroups
+     * @param array|null    $normalizationGroups
      *
      * @return AttributeMetadata
      */

Mapping/Loader/DoctrineIdentifierLoader.php

@@ -11,24 +11,25 @@
 
 namespace Dunglas\ApiBundle\Mapping\Loader;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Dunglas\ApiBundle\Mapping\ClassMetadata;
 
 /**
  * Doctrine identifier loader.
  *
  * @author Mikaël Labrut <[email protected]>
+ * @author Kévin Dunglas <[email protected]>
  */
 class DoctrineIdentifierLoader implements LoaderInterface
 {
     /**
-     * @var EntityManager
+     * @var ManagerRegistry
      */
-    private $entityManager;
+    private $managerRegistry;
 
-    public function __construct(EntityManager $entityManager)
+    public function __construct(ManagerRegistry $managerRegistry)
     {
-        $this->entityManager = $entityManager;
+        $this->managerRegistry = $managerRegistry;
     }
 
     /**
@@ -40,17 +41,29 @@ public function loadClassMetadata(
         array $denormalizationGroups = null,
         array $validationGroups = null
     ) {
-        $doctrineClassMetaData = $this->entityManager->getClassMetadata($classMetadata->getReflectionClass()->getName());
+        $className = $classMetadata->getReflectionClass()->name;
+
+        $manager = $this->managerRegistry->getManagerForClass($className);
+        if (!$manager) {
+            return true;
+        }
+
+        $doctrineClassMetaData = $manager->getClassMetadata($className);
+        if (!$doctrineClassMetaData) {
+            return true;
+        }
+
         $identifiers = $doctrineClassMetaData->getIdentifier();
+        if (1 !== count($identifiers)) {
+            return true;
+        }
 
-        if (1 === count($identifiers)) {
-            $identifierName = $identifiers[0];
+        $identifierName = $identifiers[0];
+        foreach ($classMetadata->getAttributes() as $attribute) {
+            if ($attribute->getName() === $identifierName) {
+                $attribute->setIdentifier(true);
 
-            foreach ($classMetadata->getAttributes() as $attribute) {
-                if ($attribute->getName() === $identifierName) {
-                    $attribute->setIdentifier(true);
-                    break;
-                }
+                return true;
             }
         }
 

Resources/config/doctrine_orm.xml

@@ -45,7 +45,7 @@
         </service>
 
         <service id="api.mapping.loaders.doctrine_identifier" class="Dunglas\ApiBundle\Mapping\Loader\DoctrineIdentifierLoader" public="false">
-            <argument type="service" id="doctrine.orm.default_entity_manager" />
+            <argument type="service" id="doctrine" />
         </service>
     </services>