Merge branch '7.4' into 8.0

* 7.4:
  [FrameworkBundle] Revert auto-import of #[Route] defined on controllers
  [Form] Fix EnumType choice_label logic for grouped choices

Author: nicolas-grekas

Kernel/MicroKernelTrait.php

@@ -79,13 +79,15 @@ private function configureRoutes(RoutingConfigurator $routes): void
         $routes->import($configDir.'/{routes}/'.$this->environment.'/*.{php,yaml}');
         $routes->import($configDir.'/{routes}/*.{php,yaml}');
 
-        $routes->import('routing.controllers');
-
         if (is_file($this->getConfigDir().'/routes.yaml')) {
             $routes->import($configDir.'/routes.yaml');
         } else {
             $routes->import($configDir.'/{routes}.php');
         }
+
+        if ($fileName = (new \ReflectionObject($this))->getFileName()) {
+            $routes->import($fileName, 'attribute');
+        }
     }
 
     /**