Skip to content

Commit 3700a73

Browse files
authored
Merge pull request #1020 from teohhanhui/hotfix/eager-loading-disabled
Remove FilterEagerLoadingExtension when eager loading is disabled
2 parents 9a63fdc + 98272fc commit 3700a73

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ private function registerDoctrineExtensionConfiguration(ContainerBuilder $contai
285285
{
286286
if (false === $config['eager_loading']['enabled']) {
287287
$container->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading');
288+
$container->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading');
288289
}
289290
}
290291

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public function testDisableEagerLoadingExtension()
170170
$containerBuilderProphecy = $this->getContainerBuilderProphecy();
171171
$containerBuilderProphecy->setParameter('api_platform.eager_loading.enabled', false)->shouldBeCalled();
172172
$containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading')->shouldBeCalled();
173+
$containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading')->shouldBeCalled();
173174
$containerBuilder = $containerBuilderProphecy->reveal();
174175
$this->extension->load(array_merge_recursive(self::DEFAULT_CONFIG, ['api_platform' => ['eager_loading' => ['enabled' => false]]]), $containerBuilder);
175176
}

0 commit comments

Comments
 (0)