Merge branch '5.4' into 6.0

* 5.4:
  [Security] Move Passport Attributes to their own section
  Clarify instructions by changing project name to project directory

Author: javiereguiluz

best_practices.rst

@@ -30,7 +30,7 @@ to create new Symfony applications:
 
 .. code-block:: terminal
 
-    $ symfony new my_project_name
+    $ symfony new my_project_directory
 
 Under the hood, this Symfony binary command executes the needed `Composer`_
 command to :ref:`create a new Symfony application <creating-symfony-applications>`

security/custom_authenticator.rst

@@ -335,35 +335,35 @@ would initialize the passport like this::
         }
     }
 
-.. tip::
+Passport Attributes
+-------------------
+
+Besides badges, passports can define attributes, which allows the ``authenticate()``
+method to store arbitrary information in the passport to access it from other
+authenticator methods (e.g. ``createAuthenticatedToken()``)::
 
-    Besides badges, passports can define attributes, which allows the
-    ``authenticate()`` method to store arbitrary information in the
-    passport to access it from other authenticator methods (e.g.
-    ``createToken()``)::
+    // ...
+    use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 
+    class LoginAuthenticator extends AbstractAuthenticator
+    {
         // ...
-        use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 
-        class LoginAuthenticator extends AbstractAuthenticator
+        public function authenticate(Request $request): PassportInterface
         {
-            // ...
+            // ... process the request
 
-            public function authenticate(Request $request): Passport
-            {
-                // ... process the request
+            $passport = new SelfValidatingPassport(new UserBadge($username), []);
 
-                $passport = new SelfValidatingPassport(new UserBadge($username), []);
+            // set a custom attribute (e.g. scope)
+            $passport->setAttribute('scope', $oauthScope);
 
-                // set a custom attribute (e.g. scope)
-                $passport->setAttribute('scope', $oauthScope);
-
-                return $passport;
-            }
+            return $passport;
+        }
 
-            public function createToken(Passport $passport, string $firewallName): TokenInterface
-            {
-                // read the attribute value
-                return new CustomOauthToken($passport->getUser(), $passport->getAttribute('scope'));
-            }
+        public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
+        {
+            // read the attribute value
+            return new CustomOauthToken($passport->getUser(), $passport->getAttribute('scope'));
         }
+    }

setup.rst

@@ -53,10 +53,10 @@ application:
 .. code-block:: terminal
 
     # run this if you are building a traditional web application
-    $ symfony new my_project_name --full
+    $ symfony new my_project_directory --full
 
     # run this if you are building a microservice, console application or API
-    $ symfony new my_project_name
+    $ symfony new my_project_directory
 
 The only difference between these two commands is the number of packages
 installed by default. The ``--full`` option installs all the packages that you
@@ -68,13 +68,13 @@ Symfony application using Composer:
 .. code-block:: terminal
 
     # run this if you are building a traditional web application
-    $ composer create-project symfony/website-skeleton my_project_name
+    $ composer create-project symfony/website-skeleton my_project_directory
 
     # run this if you are building a microservice, console application or API
-    $ composer create-project symfony/skeleton my_project_name
+    $ composer create-project symfony/skeleton my_project_directory
 
 No matter which command you run to create the Symfony application. All of them
-will create a new ``my_project_name/`` directory, download some dependencies
+will create a new ``my_project_directory/`` directory, download some dependencies
 into it and even generate the basic directories and files you'll need to get
 started. In other words, your new application is ready!
 
@@ -260,20 +260,20 @@ stable version. If you want to use an LTS version, add the ``--version`` option:
 .. code-block:: terminal
 
     # use the most recent LTS version
-    $ symfony new my_project_name --version=lts
+    $ symfony new my_project_directory --version=lts
 
     # use the 'next' Symfony version to be released (still in development)
-    $ symfony new my_project_name --version=next
+    $ symfony new my_project_directory --version=next
 
     # you can also select an exact specific Symfony version
-    $ symfony new my_project_name --version=5.4
+    $ symfony new my_project_directory --version=5.4
 
 The ``lts`` and ``next`` shortcuts are only available when using Symfony to
 create new projects. If you use Composer, you need to tell the exact version:
 
 .. code-block:: terminal
 
-    $ composer create-project symfony/skeleton:"^5.4" my_project_name
+    $ composer create-project symfony/skeleton:"^5.4" my_project_directory
 
 The Symfony Demo application
 ----------------------------
@@ -286,7 +286,7 @@ Run this command to create a new project based on the Symfony Demo application:
 
 .. code-block:: terminal
 
-    $ symfony new my_project_name --demo
+    $ symfony new my_project_directory --demo
 
 Start Coding!
 -------------