diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-22 12:11:00 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-22 12:11:00 +0200 |
commit | 3570d0fe102983c1b7c631e148e1b477f31e1a7f (patch) | |
tree | 007902f46c0f3ed218fef1d4fffca237afe8ab6f /Acl | |
parent | 2d3106bc00eabe7706adb66ea4dc5fcca244a694 (diff) | |
parent | 7ab68c8fe7a6bedf4f6302c027e96d9da47b6bd0 (diff) | |
download | symfony-security-3570d0fe102983c1b7c631e148e1b477f31e1a7f.zip symfony-security-3570d0fe102983c1b7c631e148e1b477f31e1a7f.tar.gz symfony-security-3570d0fe102983c1b7c631e148e1b477f31e1a7f.tar.bz2 |
Merge branch '2.6' into 2.7
* 2.6:
[Security] fix check for empty usernames
[Form] updated exception message of ButtonBuilder::setRequestHandler()
[travis] Fix deps=high jobs
[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
Diffstat (limited to 'Acl')
-rw-r--r-- | Acl/Domain/UserSecurityIdentity.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php index 3bf277f..ea17c63 100644 --- a/Acl/Domain/UserSecurityIdentity.php +++ b/Acl/Domain/UserSecurityIdentity.php @@ -36,7 +36,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface */ public function __construct($username, $class) { - if (empty($username)) { + if ('' === $username || null === $username) { throw new \InvalidArgumentException('$username must not be empty.'); } if (empty($class)) { |