Merge branch '4.4' into 5.0

javiereguiluz · javiereguiluz · commit d52691a6e19f · 2020-03-23T15:30:05.000+01:00
* 4.4:
  Update voters.rst
  Update guard_authentication.rst
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -275,14 +275,13 @@ The Guard Authenticator Methods
 Each authenticator needs the following methods:
 
 **supports(Request $request)**
-    This will be called on *every* request and your job is to decide if the
+    This is called on *every* request and your job is to decide if the
     authenticator should be used for this request (return ``true``) or if it
     should be skipped (return ``false``).
 
 **getCredentials(Request $request)**
-    This will be called on *every* request and your job is to read the token (or
-    whatever your "authentication" information is) from the request and return it.
-    These credentials are later passed as the first argument of ``getUser()``.
+    Your job is to read the token (or whatever your "authentication" information is)
+    from the request and return it. These credentials are passed to ``getUser()``.
 
 **getUser($credentials, UserProviderInterface $userProvider)**
     The ``$credentials`` argument is the value returned by ``getCredentials()``.
diff --git a/security/voters.rst b/security/voters.rst
@@ -125,7 +125,7 @@ would look like this::
                 return false;
             }
 
-            // only vote on Post objects inside this voter
+            // only vote on `Post` objects
             if (!$subject instanceof Post) {
                 return false;
             }
@@ -142,7 +142,7 @@ would look like this::
                 return false;
             }
 
-            // you know $subject is a Post object, thanks to supports
+            // you know $subject is a Post object, thanks to `supports()`
             /** @var Post $post */
             $post = $subject;
 
@@ -163,15 +163,13 @@ would look like this::
                 return true;
             }
 
-            // the Post object could have, for example, a method isPrivate()
-            // that checks a boolean $private property
+            // the Post object could have, for example, a method `isPrivate()`
             return !$post->isPrivate();
         }
 
         private function canEdit(Post $post, User $user)
         {
-            // this assumes that the data object has a getOwner() method
-            // to get the entity of the user who owns this data object
+            // this assumes that the Post object has a `getOwner()` method
             return $user === $post->getOwner();
         }
     }
@@ -261,9 +259,8 @@ voters vote for one action and object. For instance, suppose you have one voter
 checks if the user is a member of the site and a second one that checks if the user
 is older than 18.
 
-To handle these cases, the access decision manager uses an access decision
-strategy. You can configure this to suit your needs. There are three
-strategies available:
+To handle these cases, the access decision manager uses a "strategy" which you can configure.
+There are three strategies available:
 
 ``affirmative`` (default)
     This grants access as soon as there is *one* voter granting access;

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ would look like this::`
`125`	`125`	`return false;`
`126`	`126`	`}`
`127`	`127`
`128`		`- // only vote on Post objects inside this voter`
	`128`	+ // only vote on `Post` objects
`129`	`129`	`if (!$subject instanceof Post) {`
`130`	`130`	`return false;`
`131`	`131`	`}`
`@@ -142,7 +142,7 @@ would look like this::`
`142`	`142`	`return false;`
`143`	`143`	`}`
`144`	`144`
`145`		`- // you know $subject is a Post object, thanks to supports`
	`145`	+ // you know $subject is a Post object, thanks to `supports()`
`146`	`146`	`/** @var Post $post */`
`147`	`147`	`$post = $subject;`
`148`	`148`
`@@ -163,15 +163,13 @@ would look like this::`
`163`	`163`	`return true;`
`164`	`164`	`}`
`165`	`165`
`166`		`- // the Post object could have, for example, a method isPrivate()`
`167`		`- // that checks a boolean $private property`
	`166`	+ // the Post object could have, for example, a method `isPrivate()`
`168`	`167`	`return !$post->isPrivate();`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`private function canEdit(Post $post, User $user)`
`172`	`171`	`{`
`173`		`- // this assumes that the data object has a getOwner() method`
`174`		`- // to get the entity of the user who owns this data object`
	`172`	+ // this assumes that the Post object has a `getOwner()` method
`175`	`173`	`return $user === $post->getOwner();`
`176`	`174`	`}`
`177`	`175`	`}`
`@@ -261,9 +259,8 @@ voters vote for one action and object. For instance, suppose you have one voter`
`261`	`259`	`checks if the user is a member of the site and a second one that checks if the user`
`262`	`260`	`is older than 18.`
`263`	`261`
`264`		`-To handle these cases, the access decision manager uses an access decision`
`265`		`-strategy. You can configure this to suit your needs. There are three`
`266`		`-strategies available:`
	`262`	`+To handle these cases, the access decision manager uses a "strategy" which you can configure.`
	`263`	`+There are three strategies available:`
`267`	`264`
`268`	`265`	``affirmative`` (default)
`269`	`266`	`This grants access as soon as there is one voter granting access;`