Merge branch '5.2' into 5.x

derrabus · derrabus · commit 3ca3de50c336 · 2021-04-05T17:16:47.000+02:00
* 5.2:
  improve dx and document auth exception
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php
@@ -55,6 +55,9 @@ public function getUserIdentifier(): string
         return $this->userIdentifier;
     }
 
+    /**
+     * @throws AuthenticationException when the user cannot be found
+     */
     public function getUser(): UserInterface
     {
         if (null === $this->user) {
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php
@@ -45,6 +45,9 @@ public function __construct(UserBadge $userBadge, CredentialsInterface $credenti
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getUser(): UserInterface
     {
         if (null === $this->user) {
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/UserPassportInterface.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/UserPassportInterface.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Http\Authenticator\Passport;
 
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
@@ -22,5 +23,8 @@
  */
 interface UserPassportInterface extends PassportInterface
 {
+    /**
+     * @throws AuthenticationException when the user cannot be found
+     */
     public function getUser(): UserInterface;
 }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ public function getUserIdentifier(): string`
`55`	`55`	`return $this->userIdentifier;`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ /**`
	`59`	`+ * @throws AuthenticationException when the user cannot be found`
	`60`	`+ */`
`58`	`61`	`public function getUser(): UserInterface`
`59`	`62`	`{`
`60`	`63`	`if (null === $this->user) {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ public function __construct(UserBadge $userBadge, CredentialsInterface $credenti`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ /**`
	`49`	`+ * {@inheritdoc}`
	`50`	`+ */`
`48`	`51`	`public function getUser(): UserInterface`
`49`	`52`	`{`
`50`	`53`	`if (null === $this->user) {`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Authenticator\Passport;`
`13`	`13`
	`14`	`+use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`14`	`15`	`use Symfony\Component\Security\Core\User\UserInterface;`
`15`	`16`
`16`	`17`	`/**`
`@@ -22,5 +23,8 @@`
`22`	`23`	`*/`
`23`	`24`	`interface UserPassportInterface extends PassportInterface`
`24`	`25`	`{`
	`26`	`+ /**`
	`27`	`+ * @throws AuthenticationException when the user cannot be found`
	`28`	`+ */`
`25`	`29`	`public function getUser(): UserInterface;`
`26`	`30`	`}`