Merge branch '4.4' into 5.0

javiereguiluz · javiereguiluz · commit 7be1e0e31345 · 2020-03-23T11:44:33.000+01:00
* 4.4:
  Update guard_authentication.rst
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -119,10 +119,10 @@ This requires you to implement several methods::
 
         public function checkCredentials($credentials, UserInterface $user)
         {
-            // check credentials - e.g. make sure the password is valid
-            // no credential check is needed in this case
+            // Check credentials - e.g. make sure the password is valid.
+            // In case of an API token, no credential check is needed.
 
-            // return true to cause authentication success
+            // Return `true` to cause authentication success
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,10 @@ This requires you to implement several methods::`
`119`	`119`
`120`	`120`	`public function checkCredentials($credentials, UserInterface $user)`
`121`	`121`	`{`
`122`		`- // check credentials - e.g. make sure the password is valid`
`123`		`- // no credential check is needed in this case`
	`122`	`+ // Check credentials - e.g. make sure the password is valid.`
	`123`	`+ // In case of an API token, no credential check is needed.`
`124`	`124`
`125`		`- // return true to cause authentication success`
	`125`	+ // Return `true` to cause authentication success
`126`	`126`	`return true;`
`127`	`127`	`}`
`128`	`128`