Merge pull request #946 from CRC-Mismatch/patch-1

Wrap hasDefinition in ScopedContainer [fixes #945]
schmittjoh · Dec 18, 2023 · f9e82cb · f9e82cb
2 parents f757c8d + c358619
commit f9e82cb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/DependencyInjection/ScopedContainer.php b/DependencyInjection/ScopedContainer.php
@@ -72,6 +72,11 @@ public function getDefinition($id): Definition
         return $this->container->getDefinition($this->getDefinitionRealId($id));
     }
 
+    public function hasDefinition($id): bool
+    {
+        return $this->container->hasDefinition($this->getDefinitionRealId($id));
+    }
+
     public function removeAlias(string $alias)
     {
         $this->container->removeAlias($this->getDefinitionRealId($alias));

diff --git a/Tests/DependencyInjection/DoctrinePassTest.php b/Tests/DependencyInjection/DoctrinePassTest.php
@@ -59,6 +59,30 @@ public function testDoctrineDisabled()
         $this->assertFalse(self::assertDefinitionIsOfType($container, $driver, 'JMS\Serializer\Metadata\Driver\DoctrinePHPCRTypeDriver'));
     }
 
+    public function testDoctrineDisabledOnlyForInstance()
+    {
+        $container = $this->getContainer([
+            'instances' => [
+                'my_instance' => [
+                    'inherit' => true,
+                    'metadata' => ['infer_types_from_doctrine_metadata' => false],
+                ],
+            ],
+        ]);
+        $container->register('doctrine.orm.entity_manager', 'stdClass');
+        $container->register('doctrine', 'stdClass');
+        $container->register('doctrine_phpcr.odm.document_manager', 'stdClass');
+        $container->register('doctrine_phpcr', 'stdClass');
+
+        $container->compile();
+
+        $driver = $container->findDefinition('jms_serializer.instance.my_instance.metadata_driver');
+
+        $this->assertFalse(self::assertDefinitionIsOfType($container, $driver, 'JMS\Serializer\Metadata\Driver\DoctrineTypeDriver'));
+
+        $this->assertFalse(self::assertDefinitionIsOfType($container, $driver, 'JMS\Serializer\Metadata\Driver\DoctrinePHPCRTypeDriver'));
+    }
+
     public function testOrm()
     {
         $container = $this->getContainer();