Merge pull request #1827 from Zarthus/backport-2.2-issue-1725

Backport #1725 into 2.2 branch.
api-platform · Apr 9, 2018 · 905ac01 · 905ac01
2 parents 9943760 + 97f8bc9
commit 905ac01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
@@ -468,7 +468,7 @@ private function registerBundlesConfiguration(array $bundles, array $config, Xml
     private function registerCacheConfiguration(ContainerBuilder $container)
     {
         // Don't use system cache pool in dev
-        if (!$container->getParameter('kernel.debug')) {
+        if ($container->hasParameter('api_platform.metadata_cache') ? $container->getParameter('api_platform.metadata_cache') : !$container->getParameter('kernel.debug')) {
             return;
         }
 

diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -710,6 +710,9 @@ private function getBaseContainerBuilderProphecy()
             $containerBuilderProphecy->setAlias($alias, $service)->shouldBeCalled();
         }
 
+        $containerBuilderProphecy->hasParameter('api_platform.metadata_cache')->willReturn(true)->shouldBeCalled();
+        $containerBuilderProphecy->getParameter('api_platform.metadata_cache')->willReturn(true)->shouldBeCalled();
+
         return $containerBuilderProphecy;
     }
 }
diff --git a/tests/Fixtures/app/config/config_test.yml b/tests/Fixtures/app/config/config_test.yml
@@ -73,6 +73,8 @@ fos_user:
 parameters:
     container.autowiring.strict_mode: true
     container.dumper.inline_class_loader: true
+    # Enable the metadata cache to speedup the builds
+    api_platform.metadata_cache: true
 
 services:
     contain_non_resource.item_data_provider: