Multiple entity managers

src/ObjectInfo/DoctrineORMInfo.php

@@ -14,25 +14,25 @@
 namespace A2lix\AutoFormBundle\ObjectInfo;
 
 use A2lix\AutoFormBundle\Form\Type\AutoFormType;
+use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 
 class DoctrineORMInfo
 {
-    /** @var ClassMetadataFactory */
-    private $classMetadataFactory;
+    /** @var ManagerRegistry */
+    private $managerRegistry;
 
-    public function __construct(ClassMetadataFactory $classMetadataFactory)
+    public function __construct(ManagerRegistry $managerRegistry)
     {
-        $this->classMetadataFactory = $classMetadataFactory;
+        $this->managerRegistry = $managerRegistry;
     }
 
     public function getFieldsConfig(string $class): array
     {
         $fieldsConfig = [];
 
-        $metadata = $this->classMetadataFactory->getMetadataFor($class);
+        $metadata = $this->getMetadata($class);
 
         if (!empty($fields = $metadata->getFieldNames())) {
             $fieldsConfig = array_fill_keys($fields, []);
@@ -47,7 +47,7 @@ public function getFieldsConfig(string $class): array
 
     public function getAssociationTargetClass(string $class, string $fieldName): string
     {
-        $metadata = $this->classMetadataFactory->getMetadataFor($class);
+        $metadata = $this->getMetadata($class);
 
         if (!$metadata->hasAssociation($fieldName)) {
             throw new \RuntimeException(sprintf('Unable to find the association target class of "%s" in %s.', $fieldName, $class));
@@ -93,4 +93,12 @@ private function getAssocsConfig(ClassMetadata $metadata, array $assocNames): ar
 
         return $assocsConfigs;
     }
+
+    private function getMetadata(string $class): ClassMetadata
+    {
+        $em = $this->managerRegistry->getManagerForClass($class);
+        $classMetadataFactory = $em->getMetadataFactory();
+
+        return $classMetadataFactory->getMetadataFor($class);
+    }
 }

src/Resources/config/object_info.xml

@@ -7,12 +7,8 @@
     <services>
         <defaults public="false" />
 
-        <service id="a2lix_auto_form.doctrine.metadata_factory" class="Doctrine\Persistence\Mapping\ClassMetadataFactory">
-            <factory service="doctrine.orm.default_entity_manager" method="getMetadataFactory" />
-        </service>
-
         <service id="a2lix_auto_form.object_info.doctrine_orm_info" class="A2lix\AutoFormBundle\ObjectInfo\DoctrineORMInfo">
-            <argument type="service" id="a2lix_auto_form.doctrine.metadata_factory" />
+            <argument type="service" id="doctrine" />
         </service>
     </services>
 </container>

tests/Fixtures/Entity/Media.php

@@ -47,7 +47,7 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function getProduct(): Product
+    public function getProduct(): ?Product
     {
         return $this->product;
     }

tests/Form/Type/AutoFormTypeAdvancedTest.php

@@ -81,9 +81,9 @@ public function testCreationFormWithOverriddenFieldsLabel(): Product
         ];
 
         $form->submit($formData);
-        static::assertTrue($form->isSynchronized());
-        static::assertEquals($product, $form->getData());
-        static::assertEquals('URL/URI', $form->get('url')->getConfig()->getOptions()['label']);
+        self::assertTrue($form->isSynchronized());
+        self::assertEquals($product, $form->getData());
+        self::assertEquals('URL/URI', $form->get('url')->getConfig()->getOptions()['label']);
 
         return $product;
     }
@@ -132,9 +132,9 @@ public function testCreationFormWithOverriddenFieldsMappedFalse(): Product
         ];
 
         $form->submit($formData);
-        static::assertTrue($form->isSynchronized());
-        static::assertEquals($product, $form->getData());
-        static::assertEquals('blue', $form->get('color')->getData());
+        self::assertTrue($form->isSynchronized());
+        self::assertEquals($product, $form->getData());
+        self::assertEquals('blue', $form->get('color')->getData());
 
         return $product;
     }

tests/Form/Type/AutoFormTypeSimpleTest.php

@@ -32,11 +32,11 @@ public function testEmptyForm(): void
             ->getForm()
         ;
 
-        static::assertEquals(['create', 'title', 'description', 'url', 'mainMedia', 'medias'], array_keys($form->all()), 'Fields should matches Product fields');
+        self::assertEquals(['create', 'title', 'description', 'url', 'mainMedia', 'medias'], array_keys($form->all()), 'Fields should matches Product fields');
 
         $mediasFormOptions = $form->get('medias')->getConfig()->getOptions();
-        static::assertEquals(AutoFormType::class, $mediasFormOptions['entry_type'], 'Media type should be an AutoType');
-        static::assertEquals(Media::class, $mediasFormOptions['entry_options']['data_class'], 'Media should have its right data_class');
+        self::assertEquals(AutoFormType::class, $mediasFormOptions['entry_type'], 'Media type should be an AutoType');
+        self::assertEquals(Media::class, $mediasFormOptions['entry_options']['data_class'], 'Media should have its right data_class');
     }
 
     public function testCreationForm(): Product
@@ -76,8 +76,8 @@ public function testCreationForm(): Product
         ];
 
         $form->submit($formData);
-        static::assertTrue($form->isSynchronized());
-        static::assertEquals($product, $form->getData());
+        self::assertTrue($form->isSynchronized());
+        self::assertEquals($product, $form->getData());
 
         return $product;
     }
@@ -110,14 +110,14 @@ public function testEditionForm(Product $product): void
         ;
 
         $form->submit($formData);
-        static::assertTrue($form->isSynchronized());
-        static::assertEquals($product, $form->getData());
+        self::assertTrue($form->isSynchronized());
+        self::assertEquals($product, $form->getData());
 
         $view = $form->createView();
         $children = $view->children;
 
         foreach (array_keys($formData) as $key) {
-            static::assertArrayHasKey($key, $children);
+            self::assertArrayHasKey($key, $children);
         }
     }
 

tests/Form/TypeTestCase.php

@@ -19,6 +19,7 @@
 use A2lix\AutoFormBundle\ObjectInfo\DoctrineORMInfo;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Setup;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension;
 use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser;
@@ -64,7 +65,10 @@ protected function getDoctrineORMManipulator(): DoctrineORMManipulator
 
         $config = Setup::createAnnotationMetadataConfiguration([__DIR__.'/../Fixtures/Entity'], true, null, null, false);
         $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
-        $doctrineORMInfo = new DoctrineORMInfo($entityManager->getMetadataFactory());
+
+        $managerRegistry = $this->createMock(ManagerRegistry::class);
+        $managerRegistry->method('getManagerForClass')->willReturn($entityManager);
+        $doctrineORMInfo = new DoctrineORMInfo($managerRegistry);
 
         return $this->doctrineORMManipulator = new DoctrineORMManipulator($doctrineORMInfo, ['id', 'locale', 'translatable']);
     }