[FrameworkBundle] Add support for route attributes in kernel controller methods

dunglas · fabpot · commit 0ae445cb09ee · 2022-04-20T15:55:20.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Add `trust_x_sendfile_type_header` option
  * Add support for first-class callable route controller in `MicroKernelTrait`
  * Add tag `routing.condition_service` to autoconfigure routing condition services
+ * Automatically register kernel methods marked with the `Symfony\Component\Routing\Annotation\Route` attribute or annotation as controllers in `MicroKernelTrait`
 
 6.0
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -82,6 +82,10 @@ private function configureRoutes(RoutingConfigurator $routes): void
         } else {
             $routes->import($configDir.'/{routes}.php');
         }
+
+        if (false !== ($fileName = (new \ReflectionObject($this))->getFileName())) {
+            $routes->import($fileName, 'annotation');
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTraitTest.php
@@ -94,6 +94,11 @@ public function testFlexStyle()
         $response = $kernel->handle($request);
 
         $this->assertEquals('Have a great day!', $response->getContent());
+
+        $request = Request::create('/easter');
+        $response = $kernel->handle($request);
+
+        $this->assertSame('easter', $response->getContent());
     }
 
     public function testSecretLoadedFromExtension()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php
@@ -18,11 +18,14 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 class FlexStyleMicroKernel extends Kernel
 {
-    use MicroKernelTrait;
+    use MicroKernelTrait {
+        configureRoutes as traitConfigureRoutes;
+    }
 
     private $cacheDir;
 
@@ -31,6 +34,12 @@ public function halloweenAction(\stdClass $o)
         return new Response($o->halloween);
     }
 
+    #[Route('/easter')]
+    public function easterAction()
+    {
+        return new Response('easter');
+    }
+
     public function createHalloween(LoggerInterface $logger, string $halloween)
     {
         $o = new \stdClass();
@@ -73,6 +82,8 @@ public function __destruct()
 
     protected function configureRoutes(RoutingConfigurator $routes): void
     {
+        $this->traitConfigureRoutes($routes);
+
         $routes->add('halloween', '/')->controller([$this, 'halloweenAction']);
         $routes->add('halloween2', '/h')->controller($this->halloweenAction(...));
     }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ private function configureRoutes(RoutingConfigurator $routes): void`
`82`	`82`	`} else {`
`83`	`83`	`$routes->import($configDir.'/{routes}.php');`
`84`	`84`	`}`
	`85`	`+`
	`86`	`+ if (false !== ($fileName = (new \ReflectionObject($this))->getFileName())) {`
	`87`	`+ $routes->import($fileName, 'annotation');`
	`88`	`+ }`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`/**`