Merge branch '5.4' into 6.0

* 5.4:
  Fix link syntax
  Update mercure.rst Symfony Local Web Server url
  * unstable_versions.rst - upgrade
  Update license.rst
  Fix method link to isCsrfTokenValid
  Fix link reference in Upgrading to Symfony Flex
  Added attribute code block examples

Author: javiereguiluz

contributing/code/license.rst

@@ -5,7 +5,7 @@ Symfony Code License
 
 Symfony code is released under `the MIT license`_:
 
-Copyright (c) 2004-2020 Fabien Potencier
+Copyright (c) 2004-2021 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

doctrine/associations.rst

@@ -171,6 +171,32 @@ the ``Product`` entity (and getter & setter methods):
             }
         }
 
+    .. code-block:: php-attributes
+
+        // src/Entity/Product.php
+        namespace App\Entity;
+
+        // ...
+        class Product
+        {
+            // ...
+
+            #[ORM\ManyToOne(targetEntity: Category::class, inversedBy: "products")]
+            private $category;
+
+            public function getCategory(): ?Category
+            {
+                return $this->category;
+            }
+
+            public function setCategory(?Category $category): self
+            {
+                $this->category = $category;
+
+                return $this;
+            }
+        }
+
     .. code-block:: yaml
 
         # src/Resources/config/doctrine/Product.orm.yml
@@ -248,6 +274,38 @@ class that will hold these objects:
             // addProduct() and removeProduct() were also added
         }
 
+    .. code-block:: php-attributes
+
+        // src/Entity/Category.php
+        namespace App\Entity;
+
+        // ...
+        use Doctrine\Common\Collections\ArrayCollection;
+        use Doctrine\Common\Collections\Collection;
+
+        class Category
+        {
+            // ...
+
+            #[ORM\OneToMany(targetEntity: Product::class, mappedBy: "category")]
+            private $products;
+
+            public function __construct()
+            {
+                $this->products = new ArrayCollection();
+            }
+
+            /**
+             * @return Collection|Product[]
+             */
+            public function getProducts(): Collection
+            {
+                return $this->products;
+            }
+
+            // addProduct() and removeProduct() were also added
+        }
+
     .. code-block:: yaml
 
         # src/Resources/config/doctrine/Category.orm.yml
@@ -589,16 +647,30 @@ on that ``Product`` will be set to ``null`` in the database.
 
 But, instead of setting the ``category_id`` to null, what if you want the ``Product``
 to be *deleted* if it becomes "orphaned" (i.e. without a ``Category``)? To choose
-that behavior, use the `orphanRemoval`_ option inside ``Category``::
+that behavior, use the `orphanRemoval`_ option inside ``Category``:
 
-    // src/Entity/Category.php
+.. configuration-block::
 
-    // ...
+    .. code-block:: php-annotations
+
+        // src/Entity/Category.php
+
+        // ...
+
+        /**
+         * @ORM\OneToMany(targetEntity="App\Entity\Product", mappedBy="category", orphanRemoval=true)
+         */
+        private $products;
+
+    .. code-block:: php-attributes
+
+        // src/Entity/Category.php
+
+        // ...
+
+        #[ORM\OneToMany(targetEntity: Product::class, mappedBy: "category", orphanRemoval=true)]
+        private $products;
 
-    /**
-     * @ORM\OneToMany(targetEntity="App\Entity\Product", mappedBy="category", orphanRemoval=true)
-     */
-    private $products;
 
 Thanks to this, if the ``Product`` is removed from the ``Category``, it will be
 removed from the database entirely.

mercure.rst

@@ -66,7 +66,7 @@ clients.
 
 .. image:: /_images/mercure/schema.png
 
-If you use the `Symfony Local Web Server </setup/symfony_server>`_ or `Symfony Docker`_,
+If you use the :doc:`Symfony Local Web Server </setup/symfony_server>` or `Symfony Docker`_,
 a Mercure Hub is automatically available.
 
 For production usage, an official and open source (AGPL) Hub based on the Caddy web server

security/csrf.rst

@@ -150,8 +150,8 @@ generate a CSRF token in the template and store it as a hidden form field:
     </form>
 
 Then, get the value of the CSRF token in the controller action and use the
-:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController::isCsrfTokenValid`
-to check its validity::
+:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait::isCsrfTokenValid`
+method to check its validity::
 
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;

setup/unstable_versions.rst

@@ -8,7 +8,7 @@ Creating a New Project Based on an Unstable Symfony Version
 -----------------------------------------------------------
 
 
-Suppose that the Symfony 4.0 version hasn't been released yet and you want to create
+Suppose that the Symfony 5.4 version hasn't been released yet and you want to create
 a new project to test its features. First, `install the Composer package manager`_.
 Then, open a command console, enter your project's directory and
 run the following command:
@@ -24,7 +24,7 @@ in the ``my_project/`` directory.
 Upgrading your Project to an Unstable Symfony Version
 -----------------------------------------------------
 
-Suppose again that Symfony 4.0 hasn't been released yet and you want to upgrade
+Suppose again that Symfony 5.4 hasn't been released yet and you want to upgrade
 an existing application to test that your project works with it.
 
 First, open the ``composer.json`` file located in the root directory of your
@@ -35,16 +35,16 @@ new version and change your ``minimum-stability`` to ``beta``:
 
       {
           "require": {
-    +         "symfony/framework-bundle": "^4.0",
-    +         "symfony/finder": "^4.0",
+    +         "symfony/framework-bundle": "^5.4",
+    +         "symfony/finder": "^5.4",
               "...": "..."
           },
     +     "minimum-stability": "beta"
       }
 
 You can also use set ``minimum-stability`` to ``dev``, or omit this line
 entirely, and opt into your stability on each package by using constraints
-like ``4.0.*@beta``.
+like ``5.4.*@beta``.
 
 Finally, from a terminal, update your project's dependencies: