Merge branch '5.1' into 5.x

wouterj · wouterj · commit 6dde99de5388 · 2020-10-14T14:07:09.000+02:00
* 5.1:
  Fix invalid variable name
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -173,7 +173,7 @@ This requires you to implement several methods::
             // The "username" in this case is the apiToken, see the key `property`
             // of `your_db_provider` in `security.yaml`.
             // If this returns a user, checkCredentials() is called next:
-            return $userProvider->loadUserByUsername($apiToken);
+            return $userProvider->loadUserByUsername($credentials);
         }
 
         public function checkCredentials($credentials, UserInterface $user)

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ This requires you to implement several methods::`
`173`	`173`	// The "username" in this case is the apiToken, see the key `property`
`174`	`174`	// of `your_db_provider` in `security.yaml`.
`175`	`175`	`// If this returns a user, checkCredentials() is called next:`
`176`		`- return $userProvider->loadUserByUsername($apiToken);`
	`176`	`+ return $userProvider->loadUserByUsername($credentials);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`public function checkCredentials($credentials, UserInterface $user)`