Merge branch '6.4' into 7.0

javiereguiluz · javiereguiluz · commit 3b3ff02236f7 · 2024-03-04T08:28:42.000+01:00
* 6.4:
  Replace Annotation\Route with Attribute\Route
diff --git a/cache.rst b/cache.rst
@@ -898,7 +898,7 @@ In the following example, the value is requested from a controller::
 
     use App\Cache\CacheComputation;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     use Symfony\Contracts\Cache\CacheInterface;
     use Symfony\Contracts\Cache\ItemInterface;
 
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
@@ -32,7 +32,7 @@ Next, create an ``index.php`` file that defines the kernel class and runs it:
         use Symfony\Component\HttpFoundation\JsonResponse;
         use Symfony\Component\HttpFoundation\Request;
         use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Routing\Attribute\Route;
 
         require __DIR__.'/vendor/autoload.php';
 
@@ -382,7 +382,7 @@ has one file in it::
 
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class MicroController extends AbstractController
     {
diff --git a/controller.rst b/controller.rst
@@ -23,7 +23,7 @@ class::
     namespace App\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class LuckyController
     {
@@ -731,7 +731,7 @@ method::
 
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     use Symfony\Component\WebLink\Link;
 
     class HomepageController extends AbstractController
diff --git a/controller/service.rst b/controller/service.rst
@@ -66,7 +66,7 @@ apply the ``controller.service_arguments`` tag to your controller services::
 
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Attribute\AsController;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     #[AsController]
     class HelloController
@@ -95,7 +95,7 @@ a service like: ``App\Controller\HelloController::index``:
         namespace App\Controller;
 
         use Symfony\Component\HttpFoundation\Response;
-        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Routing\Attribute\Route;
 
         class HelloController
         {
@@ -157,7 +157,7 @@ which is a common practice when following the `ADR pattern`_
         namespace App\Controller;
 
         use Symfony\Component\HttpFoundation\Response;
-        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Routing\Attribute\Route;
 
         #[Route('/hello/{name}', name: 'hello')]
         class Hello
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -124,7 +124,7 @@ Finally, you need to update the code of the controller that handles the form::
     use Symfony\Component\HttpFoundation\File\UploadedFile;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     use Symfony\Component\String\Slugger\SluggerInterface;
 
     class ProductController extends AbstractController
diff --git a/controller/value_resolver.rst b/controller/value_resolver.rst
@@ -129,7 +129,7 @@ Symfony ships with the following value resolvers in the
         namespace App\Controller;
 
         use Symfony\Component\HttpFoundation\Response;
-        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Routing\Attribute\Route;
         use Symfony\Component\Uid\UuidV4;
 
         class DefaultController
@@ -175,7 +175,7 @@ In addition, some components, bridges and official bundles provide other value r
         namespace App\Controller;
 
         use Symfony\Component\HttpFoundation\Response;
-        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Routing\Attribute\Route;
 
         class DefaultController
         {
@@ -220,7 +220,7 @@ lets you do this by "targeting" the resolver you want::
     use Symfony\Component\HttpFoundation\Session\SessionInterface;
     use Symfony\Component\HttpKernel\Attribute\ValueResolver;
     use Symfony\Component\HttpKernel\Controller\ArgumentResolver\SessionValueResolver;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class SessionController
     {
diff --git a/doctrine.rst b/doctrine.rst
@@ -356,7 +356,7 @@ and save it::
     use App\Entity\Product;
     use Doctrine\ORM\EntityManagerInterface;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class ProductController extends AbstractController
     {
@@ -438,7 +438,7 @@ Consider the following controller code::
 
     use App\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
     // ...
 
@@ -502,7 +502,7 @@ be able to go to ``/product/1`` to see your new product::
     use App\Entity\Product;
     use Doctrine\ORM\EntityManagerInterface;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     // ...
 
     class ProductController extends AbstractController
@@ -535,7 +535,7 @@ and injected by the dependency injection container::
     use App\Entity\Product;
     use App\Repository\ProductRepository;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     // ...
 
     class ProductController extends AbstractController
@@ -620,7 +620,7 @@ automatically! You can simplify the controller to::
     use App\Entity\Product;
     use App\Repository\ProductRepository;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     // ...
 
     class ProductController extends AbstractController
@@ -696,7 +696,7 @@ the ``EntityValueResolver`` behavior by using the `MapEntity options`_ ::
     use App\Entity\Product;
     use Symfony\Bridge\Doctrine\Attribute\MapEntity;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     // ...
 
     class ProductController extends AbstractController
@@ -832,7 +832,7 @@ with any PHP model::
     use App\Repository\ProductRepository;
     use Doctrine\ORM\EntityManagerInterface;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
     // ...
 
     class ProductController extends AbstractController
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -312,7 +312,7 @@ Now you can see this new code in action! Imagine you're inside a controller::
     use App\Entity\Product;
     use Doctrine\ORM\EntityManagerInterface;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class ProductController extends AbstractController
     {
diff --git a/mailer.rst b/mailer.rst
@@ -438,7 +438,7 @@ and create an :class:`Symfony\\Component\\Mime\\Email` object::
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\Mailer\MailerInterface;
     use Symfony\Component\Mime\Email;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class MailerController extends AbstractController
     {
@@ -1555,7 +1555,7 @@ Here's an example of making one available to download::
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpFoundation\ResponseHeaderBag;
     use Symfony\Component\Mime\DraftEmail;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class DownloadEmailController extends AbstractController
     {
diff --git a/page_creation.rst b/page_creation.rst
@@ -69,7 +69,7 @@ metadata to code):
       // src/Controller/LuckyController.php
 
       // ...
-    + use Symfony\Component\Routing\Annotation\Route;
+    + use Symfony\Component\Routing\Attribute\Route;
 
       class LuckyController
       {
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -79,7 +79,7 @@ Thanks to Flex, after one command, you can start using Twig immediately:
       // src/Controller/DefaultController.php
       namespace App\Controller;
 
-      use Symfony\Component\Routing\Annotation\Route;
+      use Symfony\Component\Routing\Attribute\Route;
     - use Symfony\Component\HttpFoundation\Response;
     + use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
@@ -157,7 +157,7 @@ Are you building an API? You can already return JSON from any controller::
 
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\JsonResponse;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class DefaultController extends AbstractController
     {
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -27,7 +27,7 @@ use the logger in a controller, add a new argument type-hinted with ``LoggerInte
     use Psr\Log\LoggerInterface;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class DefaultController extends AbstractController
     {
@@ -108,7 +108,7 @@ Great! You can use it immediately in your controller::
     use Psr\Log\LoggerInterface;
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class DefaultController extends AbstractController
     {
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -154,7 +154,7 @@ Instead, add the route *right above* the controller method:
       namespace App\Controller;
 
       use Symfony\Component\HttpFoundation\Response;
-    + use Symfony\Component\Routing\Annotation\Route;
+    + use Symfony\Component\Routing\Attribute\Route;
 
       class DefaultController
       {
@@ -173,7 +173,7 @@ in ``DefaultController``::
     namespace App\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
-    use Symfony\Component\Routing\Annotation\Route;
+    use Symfony\Component\Routing\Attribute\Route;
 
     class DefaultController
     {
diff --git a/routing.rst b/routing.rst
diff --git a/security.rst b/security.rst
diff --git a/security/login_link.rst b/security/login_link.rst
diff --git a/service_container.rst b/service_container.rst
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
diff --git a/templates.rst b/templates.rst

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ Now you can see this new code in action! Imagine you're inside a controller::`
`312`	`312`	`use App\Entity\Product;`
`313`	`313`	`use Doctrine\ORM\EntityManagerInterface;`
`314`	`314`	`use Symfony\Component\HttpFoundation\Response;`
`315`		`- use Symfony\Component\Routing\Annotation\Route;`
	`315`	`+ use Symfony\Component\Routing\Attribute\Route;`
`316`	`316`
`317`	`317`	`class ProductController extends AbstractController`
`318`	`318`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ metadata to code):`
`69`	`69`	`// src/Controller/LuckyController.php`
`70`	`70`
`71`	`71`	`// ...`
`72`		`- + use Symfony\Component\Routing\Annotation\Route;`
	`72`	`+ + use Symfony\Component\Routing\Attribute\Route;`
`73`	`73`
`74`	`74`	`class LuckyController`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ Instead, add the route right above the controller method:`
`154`	`154`	`namespace App\Controller;`
`155`	`155`
`156`	`156`	`use Symfony\Component\HttpFoundation\Response;`
`157`		`- + use Symfony\Component\Routing\Annotation\Route;`
	`157`	`+ + use Symfony\Component\Routing\Attribute\Route;`
`158`	`158`
`159`	`159`	`class DefaultController`
`160`	`160`	`{`
@@ -173,7 +173,7 @@ in ``DefaultController``::
`173`	`173`	`namespace App\Controller;`
`174`	`174`
`175`	`175`	`use Symfony\Component\HttpFoundation\Response;`
`176`		`- use Symfony\Component\Routing\Annotation\Route;`
	`176`	`+ use Symfony\Component\Routing\Attribute\Route;`
`177`	`177`
`178`	`178`	`class DefaultController`
`179`	`179`	`{`