Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 56f0f19654a7 · 2018-07-30T15:58:16.000+02:00
* 2.8:
  Remove useless $request
  Improve the docs about custom form theme config
  Use callable classes for custom Monolog processors
  Update custom_password_authenticator.rst
diff --git a/form/form_themes.rst b/form/form_themes.rst
@@ -179,6 +179,7 @@ file:
         # app/config/config.yml
         twig:
             form_themes:
+                - '...'
                 - 'form/fields.html.twig'
             # ...
 
@@ -194,6 +195,7 @@ file:
                 http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
+                <twig:theme>...</twig:theme>
                 <twig:theme>form/fields.html.twig</twig:theme>
                 <!-- ... -->
             </twig:config>
@@ -204,11 +206,17 @@ file:
         // app/config/config.php
         $container->loadFromExtension('twig', array(
             'form_themes' => array(
+                '...',
                 'form/fields.html.twig',
             ),
             // ...
         ));
 
+.. note::
+
+    Add your custom theme at the end of the ``form_themes`` list because each
+    theme overrides all the previous themes.
+
 Any blocks inside the ``fields.html.twig`` template are now used globally
 to define form output.
 
diff --git a/logging/processors.rst b/logging/processors.rst
@@ -30,7 +30,7 @@ using a processor::
             $this->session = $session;
         }
 
-        public function processRecord(array $record)
+        public function __invoke(array $record)
         {
             if (!$this->session->isStarted()) {
                 return $record;
@@ -63,7 +63,7 @@ information:
             AppBundle\Logger\SessionRequestProcessor:
                 autowire: true
                 tags:
-                    - { name: monolog.processor, method: processRecord }
+                    - { name: monolog.processor }
 
     .. code-block:: xml
 
@@ -85,7 +85,7 @@ information:
                 </service>
 
                 <service id="AppBundle\Logger\SessionRequestProcessor" autowire="true">
-                    <tag name="monolog.processor" method="processRecord" />
+                    <tag name="monolog.processor" />
                 </service>
             </services>
         </container>
@@ -175,7 +175,7 @@ the ``monolog.processor`` tag:
             AppBundle\Logger\SessionRequestProcessor:
                 autowire: true
                 tags:
-                    - { name: monolog.processor, method: processRecord, handler: main }
+                    - { name: monolog.processor, handler: main }
 
     .. code-block:: xml
 
@@ -191,7 +191,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="AppBundle\Logger\SessionRequestProcessor" autowire="true">
-                    <tag name="monolog.processor" method="processRecord" handler="main" />
+                    <tag name="monolog.processor" handler="main" />
                 </service>
             </services>
         </container>
@@ -203,7 +203,7 @@ the ``monolog.processor`` tag:
         // ...
         $container
             ->autowire(SessionRequestProcessor::class)
-            ->addTag('monolog.processor', array('method' => 'processRecord', 'handler' => 'main'));
+            ->addTag('monolog.processor', array('handler' => 'main'));
 
 Registering Processors per Channel
 ----------------------------------
@@ -220,7 +220,7 @@ the ``monolog.processor`` tag:
             AppBundle\Logger\SessionRequestProcessor:
                 autowire: true
                 tags:
-                    - { name: monolog.processor, method: processRecord, channel: main }
+                    - { name: monolog.processor, channel: main }
 
     .. code-block:: xml
 
@@ -236,7 +236,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="AppBundle\Logger\SessionRequestProcessor" autowire="true">
-                    <tag name="monolog.processor" method="processRecord" channel="main" />
+                    <tag name="monolog.processor" channel="main" />
                 </service>
             </services>
         </container>
@@ -248,4 +248,4 @@ the ``monolog.processor`` tag:
         // ...
         $container
             ->autowire(SessionRequestProcessor::class)
-            ->addTag('monolog.processor', array('method' => 'processRecord', 'channel' => 'main'));
+            ->addTag('monolog.processor', array('channel' => 'main'));
diff --git a/security/custom_password_authenticator.rst b/security/custom_password_authenticator.rst
@@ -63,7 +63,7 @@ the user::
                 if ('' === ($givenPassword = $token->getCredentials())) {
                     throw new BadCredentialsException('The given password cannot be empty.');
                 }
-                if (!$this->encoderFactory->getEncoder($user)->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {
+                if (!$this->encoder->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {
                     throw new BadCredentialsException('The given password is invalid.');
                 }
             }
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
@@ -91,15 +91,14 @@ configuration (``login``):
         // src/AppBundle/Controller/SecurityController.php
 
         // ...
-        use Symfony\Component\HttpFoundation\Request;
         use Symfony\Component\Routing\Annotation\Route;
 
         class SecurityController extends Controller
         {
             /**
              * @Route("/login", name="login")
              */
-            public function loginAction(Request $request)
+            public function login()
             {
             }
         }
@@ -143,7 +142,7 @@ Great! Next, add the logic to ``loginAction()`` that displays the login form::
     // src/AppBundle/Controller/SecurityController.php
     use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
-    public function loginAction(Request $request, AuthenticationUtils $authenticationUtils)
+    public function login(AuthenticationUtils $authenticationUtils)
     {
         // get the login error if there is one
         $error = $authenticationUtils->getLastAuthenticationError();

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ the user::`
`63`	`63`	`if ('' === ($givenPassword = $token->getCredentials())) {`
`64`	`64`	`throw new BadCredentialsException('The given password cannot be empty.');`
`65`	`65`	`}`
`66`		`- if (!$this->encoderFactory->getEncoder($user)->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {`
	`66`	`+ if (!$this->encoder->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {`
`67`	`67`	`throw new BadCredentialsException('The given password is invalid.');`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
@@ -91,15 +91,14 @@ configuration (``login``):
`91`	`91`	`// src/AppBundle/Controller/SecurityController.php`
`92`	`92`
`93`	`93`	`// ...`
`94`		`- use Symfony\Component\HttpFoundation\Request;`
`95`	`94`	`use Symfony\Component\Routing\Annotation\Route;`
`96`	`95`
`97`	`96`	`class SecurityController extends Controller`
`98`	`97`	`{`
`99`	`98`	`/**`
`100`	`99`	`* @Route("/login", name="login")`
`101`	`100`	`*/`
`102`		`- public function loginAction(Request $request)`
	`101`	`+ public function login()`
`103`	`102`	`{`
`104`	`103`	`}`
`105`	`104`	`}`
@@ -143,7 +142,7 @@ Great! Next, add the logic to ``loginAction()`` that displays the login form::
`143`	`142`	`// src/AppBundle/Controller/SecurityController.php`
`144`	`143`	`use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;`
`145`	`144`
`146`		`- public function loginAction(Request $request, AuthenticationUtils $authenticationUtils)`
	`145`	`+ public function login(AuthenticationUtils $authenticationUtils)`
`147`	`146`	`{`
`148`	`147`	`// get the login error if there is one`
`149`	`148`	`$error = $authenticationUtils->getLastAuthenticationError();`