Skip to content

Commit 9edb56f

Browse files
committed
fix error when disabling eager_loading. Introduced by d3b690e
1 parent 15db1f3 commit 9edb56f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,10 @@ private function registerDoctrineExtensionConfiguration(ContainerBuilder $contai
412412
return;
413413
}
414414

415-
$container->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading');
416-
$container->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading');
415+
$container->removeAlias('api_platform.doctrine.orm.query_extension.eager_loading');
416+
$container->removeAlias('api_platform.doctrine.orm.query_extension.filter_eager_loading');
417+
$container->removeDefinition('ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension');
418+
$container->removeDefinition('ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension');
417419
}
418420

419421
private function registerHttpCache(ContainerBuilder $container, array $config, XmlFileLoader $loader, bool $useDoctrine)

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ public function testDisableEagerLoadingExtension()
275275
{
276276
$containerBuilderProphecy = $this->getBaseContainerBuilderProphecy();
277277
$containerBuilderProphecy->setParameter('api_platform.eager_loading.enabled', false)->shouldBeCalled();
278-
$containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading')->shouldBeCalled();
279-
$containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading')->shouldBeCalled();
278+
$containerBuilderProphecy->removeDefinition('ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension')->shouldBeCalled();
279+
$containerBuilderProphecy->removeDefinition('ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension')->shouldBeCalled();
280+
$containerBuilderProphecy->removeAlias('api_platform.doctrine.orm.query_extension.eager_loading')->shouldBeCalled();
281+
$containerBuilderProphecy->removeAlias('api_platform.doctrine.orm.query_extension.filter_eager_loading')->shouldBeCalled();
280282
$containerBuilder = $containerBuilderProphecy->reveal();
281283
$this->extension->load(array_merge_recursive(self::DEFAULT_CONFIG, ['api_platform' => ['eager_loading' => ['enabled' => false]]]), $containerBuilder);
282284
}

0 commit comments

Comments
 (0)