make the getter usable if no user identifier is set

xabbuh · xabbuh · commit 148750e38ffa · 2021-06-18T09:58:56.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Exception/UserNotFoundException.php b/src/Symfony/Component/Security/Core/Exception/UserNotFoundException.php
@@ -32,7 +32,7 @@ public function getMessageKey()
     /**
      * Get the user identifier (e.g. username or e-mailaddress).
      */
-    public function getUserIdentifier(): string
+    public function getUserIdentifier(): ?string
     {
         return $this->identifier;
     }
diff --git a/src/Symfony/Component/Security/Core/Tests/Exception/UserNotFoundExceptionTest.php b/src/Symfony/Component/Security/Core/Tests/Exception/UserNotFoundExceptionTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Security\Core\Tests\Exception;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 
 class UserNotFoundExceptionTest extends TestCase
 {
@@ -25,6 +25,23 @@ public function testGetMessageData()
         $this->assertEquals(['{{ username }}' => 'username', '{{ user_identifier }}' => 'username'], $exception->getMessageData());
     }
 
+    public function testUserIdentifierIsNotSetByDefault()
+    {
+        $exception = new UserNotFoundException();
+
+        $this->assertNull($exception->getUserIdentifier());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testUsernameIsNotSetByDefault()
+    {
+        $exception = new UserNotFoundException();
+
+        $this->assertNull($exception->getUsername());
+    }
+
     /**
      * @group legacy
      */

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function getMessageKey()`
`32`	`32`	`/**`
`33`	`33`	`* Get the user identifier (e.g. username or e-mailaddress).`
`34`	`34`	`*/`
`35`		`- public function getUserIdentifier(): string`
	`35`	`+ public function getUserIdentifier(): ?string`
`36`	`36`	`{`
`37`	`37`	`return $this->identifier;`
`38`	`38`	`}`