Merge branch '6.4' into 7.0

* 6.4:
  [FrameworkBundle][Routing] Deprecate annotations
  [FrameworkBundle][Serializer] Deprecate annotations

Author: nicolas-grekas

CHANGELOG.md

@@ -58,6 +58,10 @@ CHANGELOG
  * Change `framework.asset_mapper.importmap_polyfill` from a URL to the name of an item in the importmap
  * Provide `$buildDir` when running `CacheWarmer` to build read-only resources
  * Add the global `--profile` option to the console to enable profiling commands
+ * Deprecate the `routing.loader.annotation` service, use the `routing.loader.attribute` service instead
+ * Deprecate the `routing.loader.annotation.directory` service, use the `routing.loader.attribute.directory` service instead
+ * Deprecate the `routing.loader.annotation.file` service, use the `routing.loader.attribute.file` service instead
+ * Deprecate `AnnotatedRouteControllerLoader`, use `AttributeRouteControllerLoader` instead
 
 6.3
 ---

DependencyInjection/FrameworkExtension.php

@@ -151,7 +151,7 @@
 use Symfony\Component\Semaphore\Store\StoreFactory as SemaphoreStoreFactory;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -1858,7 +1858,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $serializerLoaders = [];
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
-            $annotationLoader = new Definition(AnnotationLoader::class);
+            $annotationLoader = new Definition(AttributeLoader::class);
 
             $serializerLoaders[] = $annotationLoader;
         }

Kernel/MicroKernelTrait.php

@@ -85,7 +85,7 @@ private function configureRoutes(RoutingConfigurator $routes): void
         }
 
         if (false !== ($fileName = (new \ReflectionObject($this))->getFileName())) {
-            $routes->import($fileName, 'annotation');
+            $routes->import($fileName, 'attribute');
         }
     }
 

Resources/config/routing.php

@@ -15,7 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
-use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
+use Symfony\Bundle\FrameworkBundle\Routing\AttributeRouteControllerLoader;
 use Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader;
 use Symfony\Bundle\FrameworkBundle\Routing\RedirectableCompiledUrlMatcher;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
@@ -24,8 +24,8 @@
 use Symfony\Component\Routing\Generator\CompiledUrlGenerator;
 use Symfony\Component\Routing\Generator\Dumper\CompiledUrlGeneratorDumper;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
-use Symfony\Component\Routing\Loader\AnnotationFileLoader;
+use Symfony\Component\Routing\Loader\AttributeDirectoryLoader;
+use Symfony\Component\Routing\Loader\AttributeFileLoader;
 use Symfony\Component\Routing\Loader\ContainerLoader;
 use Symfony\Component\Routing\Loader\DirectoryLoader;
 use Symfony\Component\Routing\Loader\GlobFileLoader;
@@ -92,26 +92,35 @@
             ])
             ->tag('routing.loader')
 
-        ->set('routing.loader.annotation', AnnotatedRouteControllerLoader::class)
+        ->set('routing.loader.attribute', AttributeRouteControllerLoader::class)
             ->args([
                 '%kernel.environment%',
             ])
             ->tag('routing.loader', ['priority' => -10])
 
-        ->set('routing.loader.annotation.directory', AnnotationDirectoryLoader::class)
+        ->alias('routing.loader.annotation', 'routing.loader.attribute')
+            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute" service instead.')
+
+        ->set('routing.loader.attribute.directory', AttributeDirectoryLoader::class)
             ->args([
                 service('file_locator'),
-                service('routing.loader.annotation'),
+                service('routing.loader.attribute'),
             ])
             ->tag('routing.loader', ['priority' => -10])
 
-        ->set('routing.loader.annotation.file', AnnotationFileLoader::class)
+        ->alias('routing.loader.annotation.directory', 'routing.loader.attribute.directory')
+            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute.directory" service instead.')
+
+        ->set('routing.loader.attribute.file', AttributeFileLoader::class)
             ->args([
                 service('file_locator'),
-                service('routing.loader.annotation'),
+                service('routing.loader.attribute'),
             ])
             ->tag('routing.loader', ['priority' => -10])
 
+        ->alias('routing.loader.annotation.file', 'routing.loader.attribute.file')
+            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute.file" service instead.')
+
         ->set('routing.loader.psr4', Psr4DirectoryLoader::class)
             ->args([
                 service('file_locator'),

Routing/AnnotatedRouteControllerLoader.php renamed to Routing/AttributeRouteControllerLoader.php

@@ -11,21 +11,24 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Routing;
 
-use Symfony\Component\Routing\Loader\AnnotationClassLoader;
+use Symfony\Component\Routing\Loader\AttributeClassLoader;
 use Symfony\Component\Routing\Route;
 
 /**
- * AnnotatedRouteControllerLoader is an implementation of AnnotationClassLoader
+ * AttributeRouteControllerLoader is an implementation of AttributeClassLoader
  * that sets the '_controller' default based on the class and method names.
  *
  * @author Fabien Potencier <[email protected]>
+ * @author Alexandre Daubois <[email protected]>
  */
-class AnnotatedRouteControllerLoader extends AnnotationClassLoader
+class AttributeRouteControllerLoader extends AttributeClassLoader
 {
     /**
      * Configures the _controller default parameter of a given Route instance.
+     *
+     * @return void
      */
-    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
+    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
     {
         if ('__invoke' === $method->getName()) {
             $route->setDefault('_controller', $class->getName());
@@ -48,3 +51,7 @@ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMetho
         return str_replace('__', '_', $name);
     }
 }
+
+if (!class_exists(AnnotatedRouteControllerLoader::class, false)) {
+    class_alias(AttributeRouteControllerLoader::class, AnnotatedRouteControllerLoader::class);
+}

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -63,7 +63,7 @@
 use Symfony\Component\Notifier\TexterInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Security\Core\AuthenticationEvents;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
@@ -1425,7 +1425,7 @@ public function testSerializerEnabled()
         $argument = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
 
         $this->assertCount(2, $argument);
-        $this->assertEquals(AnnotationLoader::class, $argument[0]->getClass());
+        $this->assertEquals(AttributeLoader::class, $argument[0]->getClass());
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1));
         $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
         $this->assertArrayHasKey('circular_reference_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));

Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml

@@ -67,7 +67,7 @@ http_client_call:
 
 uid:
     resource: "../../Controller/UidController.php"
-    type: "annotation"
+    type: "attribute"
 
 send_notification:
     path:     /send_notification

Tests/Functional/app/RoutingConditionService/routing.yml

@@ -1,4 +1,4 @@
 _routingconditionservice_bundle:
     prefix:   /
     resource: "@RoutingConditionServiceBundle/Controller"
-    type:     annotation
+    type:     attribute