Merge branch '4.4' into 5.0

javiereguiluz · javiereguiluz · commit 29c8a743a487 · 2020-03-17T15:15:57.000+01:00
* 4.4:
  Made the constant private
  Update form_login_setup.rst
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
@@ -192,6 +192,8 @@ a traditional HTML form that submits to ``/login``:
     {
         use TargetPathTrait;
 
+        private const LOGIN_ROUTE = 'app_login';
+
         private $entityManager;
         private $urlGenerator;
         private $csrfTokenManager;
@@ -207,7 +209,7 @@ a traditional HTML form that submits to ``/login``:
 
         public function supports(Request $request)
         {
-            return 'app_login' === $request->attributes->get('_route')
+            return self::LOGIN_ROUTE === $request->attributes->get('_route')
                 && $request->isMethod('POST');
         }
 
@@ -260,7 +262,7 @@ a traditional HTML form that submits to ``/login``:
 
         protected function getLoginUrl()
         {
-            return $this->urlGenerator->generate('app_login');
+            return $this->urlGenerator->generate(self::LOGIN_ROUTE);
         }
     }
 

Original file line number	Diff line number	Diff line change
@@ -192,6 +192,8 @@ a traditional HTML form that submits to ``/login``:
`192`	`192`	`{`
`193`	`193`	`use TargetPathTrait;`
`194`	`194`
	`195`	`+ private const LOGIN_ROUTE = 'app_login';`
	`196`	`+`
`195`	`197`	`private $entityManager;`
`196`	`198`	`private $urlGenerator;`
`197`	`199`	`private $csrfTokenManager;`
@@ -207,7 +209,7 @@ a traditional HTML form that submits to ``/login``:
`207`	`209`
`208`	`210`	`public function supports(Request $request)`
`209`	`211`	`{`
`210`		`- return 'app_login' === $request->attributes->get('_route')`
	`212`	`+ return self::LOGIN_ROUTE === $request->attributes->get('_route')`
`211`	`213`	`&& $request->isMethod('POST');`
`212`	`214`	`}`
`213`	`215`
@@ -260,7 +262,7 @@ a traditional HTML form that submits to ``/login``:
`260`	`262`
`261`	`263`	`protected function getLoginUrl()`
`262`	`264`	`{`
`263`		`- return $this->urlGenerator->generate('app_login');`
	`265`	`+ return $this->urlGenerator->generate(self::LOGIN_ROUTE);`
`264`	`266`	`}`
`265`	`267`	`}`
`266`	`268`