bug #57455 [FrameworkBundle] Fix Kernel configuration loading (yceruto)

This PR was merged into the 7.2 branch.

Discussion
----------

[FrameworkBundle] Fix Kernel configuration loading

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Issues        | -
| License       | MIT

- [x] Adding tests for it to avoid any regression in the future

Commits
-------

afa40bdca8 Fix kernel configuration loading

Author: fabpot

Kernel/MicroKernelTrait.php

@@ -54,7 +54,7 @@ private function configureContainer(ContainerConfigurator $container, LoaderInte
         $container->import($configDir.'/{packages}/*.{php,yaml}');
         $container->import($configDir.'/{packages}/'.$this->environment.'/*.{php,yaml}');
 
-        if (is_file($configDir.'/services.yaml')) {
+        if (is_file($this->getConfigDir().'/services.yaml')) {
             $container->import($configDir.'/services.yaml');
             $container->import($configDir.'/{services}_'.$this->environment.'.yaml');
         } else {
@@ -79,7 +79,7 @@ private function configureRoutes(RoutingConfigurator $routes): void
         $routes->import($configDir.'/{routes}/'.$this->environment.'/*.{php,yaml}');
         $routes->import($configDir.'/{routes}/*.{php,yaml}');
 
-        if (is_file($configDir.'/routes.yaml')) {
+        if (is_file($this->getConfigDir().'/routes.yaml')) {
             $routes->import($configDir.'/routes.yaml');
         } else {
             $routes->import($configDir.'/{routes}.php');

Tests/Kernel/MicroKernelTraitTest.php

@@ -25,6 +25,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
+require_once __DIR__.'/default/src/DefaultKernel.php';
 require_once __DIR__.'/flex-style/src/FlexStyleMicroKernel.php';
 
 class MicroKernelTraitTest extends TestCase
@@ -150,6 +151,19 @@ public function testSimpleKernel()
 
         $this->assertSame('Hello World!', $response->getContent());
     }
+
+    public function testDefaultKernel()
+    {
+        $kernel = $this->kernel = new DefaultKernel('test', false);
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->has('foo_service'));
+
+        $request = Request::create('/');
+        $response = $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
+
+        $this->assertSame('OK', $response->getContent());
+    }
 }
 
 abstract class MinimalKernel extends Kernel

Tests/Kernel/default/config/bundles.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return [
+    FrameworkBundle::class => ['all' => true],
+];

Tests/Kernel/default/config/routes.yaml

@@ -0,0 +1,3 @@
+welcome:
+    path: /
+    controller: 'kernel'

Tests/Kernel/default/config/services.yaml

@@ -0,0 +1,4 @@
+services:
+    foo_service:
+        class: stdClass
+        public: true

Tests/Kernel/default/src/DefaultKernel.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
+
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Kernel;
+
+class DefaultKernel extends Kernel
+{
+    use MicroKernelTrait;
+
+    public function __invoke(): Response
+    {
+        return new Response('OK');
+    }
+
+    private string $cacheDir;
+
+    public function getCacheDir(): string
+    {
+        return $this->cacheDir ??= sys_get_temp_dir().'/sf_default_kernel';
+    }
+
+    public function getLogDir(): string
+    {
+        return $this->cacheDir;
+    }
+
+    public function getProjectDir(): string
+    {
+        return \dirname(__DIR__);
+    }
+}