summaryrefslogtreecommitdiffstats
path: root/Core/User
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-07-22 13:24:41 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-07-22 13:24:41 +0200
commit185507f0f15e07f162d047306f018fd55cdf5d3c (patch)
treea1e2df8849ef8fcc874982fbe99f6655a8aa8d0c /Core/User
parentb57956299e1d75663d748645564d76efcb9e72f3 (diff)
parent3570d0fe102983c1b7c631e148e1b477f31e1a7f (diff)
downloadsymfony-security-185507f0f15e07f162d047306f018fd55cdf5d3c.zip
symfony-security-185507f0f15e07f162d047306f018fd55cdf5d3c.tar.gz
symfony-security-185507f0f15e07f162d047306f018fd55cdf5d3c.tar.bz2
Merge branch '2.7' into 2.8
* 2.7: [HttpKernel] Fix lowest dep [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpKernel/composer.json
Diffstat (limited to 'Core/User')
-rw-r--r--Core/User/User.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/User/User.php b/Core/User/User.php
index d458b72..bc81f7f 100644
--- a/Core/User/User.php
+++ b/Core/User/User.php
@@ -30,7 +30,7 @@ final class User implements AdvancedUserInterface
public function __construct($username, $password, array $roles = array(), $enabled = true, $userNonExpired = true, $credentialsNonExpired = true, $userNonLocked = true)
{
- if (empty($username)) {
+ if ('' === $username || null === $username) {
throw new \InvalidArgumentException('The username cannot be empty.');
}