From 3055d6aa718c0cbaf64ca130f486a28ad1039214 Mon Sep 17 00:00:00 2001 From: Teoh Han Hui Date: Thu, 30 Mar 2017 11:57:15 +0800 Subject: [PATCH 1/2] Remove FilterEagerLoadingExtension when eager loading is disabled --- .../Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php index c0a0ee8bb74..95e1b17d01b 100644 --- a/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php +++ b/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php @@ -285,6 +285,7 @@ private function registerDoctrineExtensionConfiguration(ContainerBuilder $contai { if (false === $config['eager_loading']['enabled']) { $container->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading'); + $container->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading'); } } From 98272fc0e8093550f866bce6d96d848b276d108f Mon Sep 17 00:00:00 2001 From: soyuka Date: Sat, 1 Apr 2017 09:20:28 +0200 Subject: [PATCH 2/2] Test remove filterEagerLoadingExtension when eager loading is disabled --- .../Bundle/DependencyInjection/ApiPlatformExtensionTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php index 28542e64dda..f0d848ddb7d 100644 --- a/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php +++ b/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php @@ -170,6 +170,7 @@ public function testDisableEagerLoadingExtension() $containerBuilderProphecy = $this->getContainerBuilderProphecy(); $containerBuilderProphecy->setParameter('api_platform.eager_loading.enabled', false)->shouldBeCalled(); $containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.eager_loading')->shouldBeCalled(); + $containerBuilderProphecy->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading')->shouldBeCalled(); $containerBuilder = $containerBuilderProphecy->reveal(); $this->extension->load(array_merge_recursive(self::DEFAULT_CONFIG, ['api_platform' => ['eager_loading' => ['enabled' => false]]]), $containerBuilder); }