minor #13130 Update twig.rst (zairigimad)

javiereguiluz · HeahDude · commit 24f7fcf26db7 · 2020-02-16T11:47:42.000+01:00
This PR was submitted for the 5.0 branch but it was merged into the 3.4 branch instead (closes #13130). Discussion ---------- Update twig.rst Typo ? Commits ------- a7dac72 Update twig.rst
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -80,7 +80,7 @@ If set to a string, the template contents are escaped using the strategy with
 that name. Allowed values are ``html``, ``js``, ``css``, ``url``, ``html_attr``
 and ``name``. The default value is ``name``. This strategy escapes contents
 according to the template name extension (e.g. it uses ``html`` for ``*.html.twig``
-templates and ``js`` for ``*.js.html`` templates).
+templates and ``js`` for ``*.js.twig`` templates).
 
 .. tip::
 
diff --git a/security/access_control.rst b/security/access_control.rst
@@ -59,7 +59,10 @@ Take the following ``access_control`` entries as an example:
                 <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$"/>
                 <rule path="^/admin" role="ROLE_USER_METHOD" methods="POST, PUT"/>
                 <!-- when defining multiple roles, users must have at least one of them (it's like an OR condition) -->
-                <rule path="^/admin" roles="ROLE_ADMIN, ROLE_MANAGER"/>
+                <rule path="^/admin">
+                    <role>ROLE_ADMIN</role>
+                    <role>ROLE_MANAGER</role>
+                </rule>
             </config>
         </srv:container>
 
diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst
@@ -172,7 +172,7 @@ the value returned for the expected WSSE information, creates a token using
 that information, and passes the token on to the authentication manager. If
 the proper information is not provided, or the authentication manager throws
 an :class:`Symfony\\Component\\Security\\Core\\Exception\\AuthenticationException`,
-a 403 Response is returned.
+a 401 Response is returned.
 
 .. note::
 
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -246,9 +246,9 @@ the username and then check the password (more on passwords in a moment):
                 <!-- ... -->
 
                 <provider name="our_db_provider">
-                    <!-- if you're using multiple entity managers, add:
-                         manager-name="customer" -->
                     <entity class="AppBundle:User" property="username"/>
+                    <!-- if you're using multiple entity managers -->
+                    <entity class="AppBundle:User" property="username" manager-name="customer"/>
                 </provider>
 
                 <firewall name="main" pattern="^/" provider="our_db_provider">
diff --git a/security/force_https.rst b/security/force_https.rst
@@ -33,7 +33,7 @@ to use HTTPS then you could use the following configuration:
                 <config>
                     <!-- ... -->
 
-                    <rule path="^/secure" role="ROLE_ADMIN" requires_channel="https"/>
+                    <rule path="^/secure" role="ROLE_ADMIN" requires-channel="https"/>
                 </config>
             </srv:container>
 
@@ -83,7 +83,7 @@ role:
 
                 <rule path="^/login"
                     role="IS_AUTHENTICATED_ANONYMOUSLY"
-                    requires_channel="https"
+                    requires-channel="https"
                 />
             </config>
         </srv:container>
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -116,7 +116,7 @@ Next, make sure you've configured a "user provider" for the user:
                 <!-- ... -->
 
                 <provider name="your_db_provider">
-                    <entity class="AppBundle:User"/>
+                    <entity class="AppBundle:User" property="apiKey"/>
                 </provider>
 
                 <!-- ... -->
@@ -133,6 +133,7 @@ Next, make sure you've configured a "user provider" for the user:
                 'your_db_provider' => [
                     'entity' => [
                         'class' => 'AppBundle:User',
+                        'property' => 'apiKey',
                     ],
                 ],
             ],
@@ -305,9 +306,9 @@ Finally, configure your ``firewalls`` key in ``security.yml`` to use this authen
 
                 <firewall name="main"
                     pattern="^/"
-                    anonymous="true"
                 >
-                    <logoutOjso/>
+                    <anonymous/>
+                    <logout/>
 
                     <guard>
                         <authenticator>AppBundle\Security\TokenAuthenticator</authenticator>
diff --git a/security/json_login_setup.rst b/security/json_login_setup.rst
@@ -184,8 +184,8 @@ The security configuration should be:
                 <firewall name="main">
                     <anonymous/>
                     <json-login check-path="login"
-                                username-path="security.credentials.login"
-                                password-path="security.credentials.password"/>
+                        username-path="security.credentials.login"
+                        password-path="security.credentials.password"/>
                 </firewall>
             </config>
         </srv:container>
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -152,20 +152,20 @@ use the ``ldap`` user provider.
 
             <config>
                 <provider name="my_ldap">
-                    <ldap
-                            service="Symfony\Component\Ldap\Ldap"
-                            base-dn="dc=example,dc=com"
-                            search-dn="cn=read-only-admin,dc=example,dc=com"
-                            search-password="password"
-                            default-roles="ROLE_USER"
-                            uid-key="uid"
+                    <ldap service="Symfony\Component\Ldap\Ldap"
+                        base-dn="dc=example,dc=com"
+                        search-dn="cn=read-only-admin,dc=example,dc=com"
+                        search-password="password"
+                        default-roles="ROLE_USER"
+                        uid-key="uid"
                     />
                 </provider>
             </config>
         </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
         use Symfony\Component\Ldap\Ldap;
 
         $container->loadFromExtension('security', [
@@ -358,15 +358,15 @@ Configuration example for form login
 
             <config>
                 <firewall name="main">
-                    <form-login-ldap
-                            service="Symfony\Component\Ldap\Ldap"
-                            dn-string="uid={username},dc=example,dc=com"/>
+                    <form-login-ldap service="Symfony\Component\Ldap\Ldap"
+                        dn-string="uid={username},dc=example,dc=com"/>
                 </firewall>
             </config>
         </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
         use Symfony\Component\Ldap\Ldap;
 
         $container->loadFromExtension('security', [
@@ -394,7 +394,7 @@ Configuration example for HTTP Basic
 
             firewalls:
                 main:
-                    # ...
+                    stateless: true
                     http_basic_ldap:
                         # ...
                         service: Symfony\Component\Ldap\Ldap
@@ -412,13 +412,15 @@ Configuration example for HTTP Basic
 
             <config>
                 <firewall name="main" stateless="true">
-                    <http-basic-ldap service="Symfony\Component\Ldap\Ldap" dn-string="uid={username},dc=example,dc=com"/>
+                    <http-basic-ldap service="Symfony\Component\Ldap\Ldap"
+                        dn-string="uid={username},dc=example,dc=com"/>
                 </firewall>
             </config>
         </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
         use Symfony\Component\Ldap\Ldap;
 
         $container->loadFromExtension('security', [
@@ -466,10 +468,9 @@ Configuration example for form login and query_string
 
             <config>
                 <firewall name="main">
-                    <form-login-ldap
-                            service="Symfony\Component\Ldap\Ldap"
-                            dn-string="dc=example,dc=com"
-                            query-string="(&amp;(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))"/>
+                    <form-login-ldap service="Symfony\Component\Ldap\Ldap"
+                        dn-string="dc=example,dc=com"
+                        query-string="(&amp;(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))"/>
                 </firewall>
             </config>
         </srv:container>
diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst
@@ -68,7 +68,7 @@ This is how your security configuration can look in action:
                 'default' => [
                     'anonymous' => null,
                     'guard' => [
-                        'entry_point' => '',
+                        'entry_point' => LoginFormAuthenticator::class,
                         'authenticators' => [
                             LoginFormAuthenticator::class,
                             FacebookConnectAuthenticator::class,
diff --git a/security/multiple_user_providers.rst b/security/multiple_user_providers.rst
@@ -149,7 +149,6 @@ the first provider is always used:
                     'pattern' => '^/',
                     'provider' => 'user_db',
                     'http_basic' => [
-                        // ...
                         'realm' => 'Secured Demo Area',
                         'provider' => 'in_memory',
                     ],
diff --git a/security/remember_me.rst b/security/remember_me.rst
@@ -348,7 +348,7 @@ service you just created:
                     <!-- ... -->
 
                     <remember-me
-                        token_provider="Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider"
+                        token-provider="Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider"
                         />
                 </firewall>
             </config>
@@ -357,6 +357,8 @@ service you just created:
     .. code-block:: php
 
         // app/config/security.php
+        use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider;
+
         $container->loadFromExtension('security', [
             // ...
 
@@ -365,7 +367,7 @@ service you just created:
                     // ...
                     'remember_me' => [
                         // ...
-                        'token_provider' => 'Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider',
+                        'token_provider' => DoctrineTokenProvider:class,
                     ],
                 ],
             ],
diff --git a/security/user_checkers.rst b/security/user_checkers.rst
@@ -89,8 +89,9 @@ is the service id of your user checker:
 
             <config>
                 <!-- ... -->
-                <firewall name="main" pattern="^/">
-                    <user-checker>AppBundle\Security\UserChecker</user-checker>
+                <firewall name="main"
+                    pattern="^/"
+                    user-checker="AppBundle\Security\UserChecker">
                     <!-- ... -->
                 </firewall>
             </config>
@@ -99,11 +100,10 @@ is the service id of your user checker:
     .. code-block:: php
 
         // app/config/security.php
-
-        // ...
         use AppBundle\Security\UserChecker;
 
         $container->loadFromExtension('security', [
+            // ...
             'firewalls' => [
                 'main' => [
                     'pattern' => '^/',
