Turn @method annotations into real method declarations

Author: nicolas-grekas

Kernel/MicroKernelTrait.php

@@ -20,15 +20,13 @@
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Routing\Loader\PhpFileLoader as RoutingPhpFileLoader;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 /**
  * A Kernel that provides configuration hooks.
  *
  * @author Ryan Weaver <[email protected]>
  * @author Fabien Potencier <[email protected]>
  *
- * @method void configureRoutes(RoutingConfigurator $routes)
  * @method void configureContainer(ContainerConfigurator $container)
  */
 trait MicroKernelTrait
@@ -42,7 +40,7 @@ trait MicroKernelTrait
      *         ->controller('App\Controller\AdminController::dashboard')
      *     ;
      */
-    //abstract protected function configureRoutes(RoutingConfigurator $routes): void;
+    abstract protected function configureRoutes(RoutingConfigurator $routes): void;
 
     /**
      * Configures the container.
@@ -174,23 +172,6 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
         $kernelLoader->setCurrentDir(\dirname($file));
         $collection = new RouteCollection();
 
-        try {
-            $configureRoutes = new \ReflectionMethod($this, 'configureRoutes');
-        } catch (\ReflectionException $e) {
-            throw new \LogicException(sprintf('"%s" uses "%s", but does not implement the required method "protected function configureRoutes(RoutingConfigurator $routes): void".', get_debug_type($this), MicroKernelTrait::class), 0, $e);
-        }
-
-        $configuratorClass = $configureRoutes->getNumberOfParameters() > 0 && ($type = $configureRoutes->getParameters()[0]->getType()) instanceof \ReflectionNamedType && !$type->isBuiltin() ? $type->getName() : null;
-
-        if ($configuratorClass && !is_a(RoutingConfigurator::class, $configuratorClass, true)) {
-            trigger_deprecation('symfony/framework-bundle', '5.1', 'Using type "%s" for argument 1 of method "%s:configureRoutes()" is deprecated, use "%s" instead.', RouteCollectionBuilder::class, self::class, RoutingConfigurator::class);
-
-            $routes = new RouteCollectionBuilder($loader);
-            $this->configureRoutes($routes);
-
-            return $routes->build();
-        }
-
         $this->configureRoutes(new RoutingConfigurator($collection, $kernelLoader, $file, $file, $this->getEnvironment()));
 
         foreach ($collection as $route) {

Tests/Kernel/MicroKernelTraitTest.php

@@ -140,24 +140,6 @@ protected function configureRoutes(RoutingConfigurator $routes): void
 
         $kernel->boot();
     }
-
-    public function testMissingConfigureRoutes()
-    {
-        $kernel = new class('missing_configure_routes') extends MinimalKernel {
-            protected function configureContainer(ContainerConfigurator $c): void
-            {
-                $c->extension('framework', [
-                    'router' => ['utf8' => true],
-                ]);
-            }
-        };
-
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('"Symfony\Bundle\FrameworkBundle\Tests\Kernel\MinimalKernel@anonymous" uses "Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait", but does not implement the required method "protected function configureRoutes(RoutingConfigurator $routes): void".');
-
-        $request = Request::create('/');
-        $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
-    }
 }
 
 abstract class MinimalKernel extends Kernel