Merge branch '1.1'

* 1.1: Make build passing again HOTFIX: Do not require NelmioAliceBundle in shared kernel
Sylius · Apr 10, 2018 · da9ca37 · da9ca37
2 parents 1bb2d30 + 2ce672c
commit da9ca37
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -30,6 +30,7 @@ public function registerBundles(): array
 
         if (in_array($this->getEnvironment(), ['dev', 'test', 'test_cached'], true)) {
             $bundles[] = new \Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle();
+            $bundles[] = new \Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle();
         }
 
         return array_merge(parent::registerBundles(), $bundles);

diff --git a/app/TestAppKernel.php b/app/TestAppKernel.php
@@ -52,7 +52,11 @@ protected function cleanupContainer(ContainerInterface $container): void
 
         $services = $containerServicesPropertyReflection->getValue($container) ?: [];
         foreach ($services as $serviceId => $service) {
-            if (in_array($serviceId, $this->getServicesToIgnoreDuringContainerCleanup())) {
+            if (null === $service) {
+                continue;
+            }
+
+            if (in_array($serviceId, $this->getServicesToIgnoreDuringContainerCleanup(), true)) {
                 continue;
             }
 

diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
@@ -100,7 +100,6 @@ public function registerBundles(): array
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test', 'test_cached'], true)) {
-            $bundles[] = new \Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle();
             $bundles[] = new \Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new \Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new \Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();