[FrameworkBundle] Added flex-based default implementation for MicroKernelTrait::registerBundles()

nicolas-grekas · nicolas-grekas · commit ce63ec375cff · 2019-12-07T16:50:02.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Marked `MicroKernelTrait::configureRoutes()` as `@internal` and `@final`.
  * Deprecated not overriding `MicroKernelTrait::configureRouting()`.
  * Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.
+ * Added flex-based default implementation for `MicroKernelTrait::registerBundles()`
 
 5.0.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Kernel;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
@@ -72,6 +73,19 @@ protected function configureRouting(RoutingConfigurator $routes): void
      */
     abstract protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader);
 
+    /**
+     * {@inheritdoc}
+     */
+    public function registerBundles(): iterable
+    {
+        $contents = require $this->getProjectDir().'/config/bundles.php';
+        foreach ($contents as $class => $envs) {
+            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
+                yield new $class();
+            }
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -99,6 +113,10 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 $kernelDefinition->addTag('kernel.event_subscriber');
             }
 
+            $container->fileExists($this->getProjectDir().'/config/bundles.php');
+            $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || !ini_get('opcache.preload'));
+            $container->setParameter('container.dumper.inline_factories', true);
+
             $this->configureContainer($container, $loader);
 
             $container->addObjectResource($this);
