AuthenticationUtils::getLastUsername()` now always returns a string.

vudaltsov · vudaltsov · commit 743692c3fd9e · 2018-03-10T22:15:45.000+03:00
diff --git a/UPGRADE-4.1.md b/UPGRADE-4.1.md
@@ -65,6 +65,7 @@ Security
  * Using the `AdvancedUserInterface` is now deprecated. To use the existing
    functionality, create a custom user-checker based on the
    `Symfony\Component\Security\Core\User\UserChecker`.
+ * `AuthenticationUtils::getLastUsername()` now always returns a string.
 
 SecurityBundle
 --------------
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Using the AdvancedUserInterface is now deprecated. To use the existing
    functionality, create a custom user-checker based on the
    `Symfony\Component\Security\Core\User\UserChecker`.
+ * `AuthenticationUtils::getLastUsername()` now always returns a string.
 
 4.0.0
 -----
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php
@@ -62,12 +62,12 @@ public function getLastUsername()
         $request = $this->getRequest();
 
         if ($request->attributes->has(Security::LAST_USERNAME)) {
-            return $request->attributes->get(Security::LAST_USERNAME);
+            return $request->attributes->get(Security::LAST_USERNAME, '');
         }
 
         $session = $request->getSession();
 
-        return null === $session ? '' : $session->get(Security::LAST_USERNAME);
+        return null === $session ? '' : $session->get(Security::LAST_USERNAME, '');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public function getLastUsername()`
`62`	`62`	`$request = $this->getRequest();`
`63`	`63`
`64`	`64`	`if ($request->attributes->has(Security::LAST_USERNAME)) {`
`65`		`- return $request->attributes->get(Security::LAST_USERNAME);`
	`65`	`+ return $request->attributes->get(Security::LAST_USERNAME, '');`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$session = $request->getSession();`
`69`	`69`
`70`		`- return null === $session ? '' : $session->get(Security::LAST_USERNAME);`
	`70`	`+ return null === $session ? '' : $session->get(Security::LAST_USERNAME, '');`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`