diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-04 09:55:19 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-04 09:55:19 +0100 |
| commit | 3598ef3378bcfb03fba1e368e168f30bb8169eb2 (patch) | |
| tree | 37398a71f681242885ee0ce15985c42506aeb671 /Core/Tests/User/ChainUserProviderTest.php | |
| parent | aba0b41e79aaae3c8eb9c52f9b2da2f01adb80ca (diff) | |
| parent | 4d93fe20999aa43de372f053ff9f8ec5a85b6fa5 (diff) | |
| download | symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.zip symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.tar.gz symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.3.24
updated VERSION for 2.3.23
update CONTRIBUTORS for 2.3.23
updated CHANGELOG for 2.3.23
Conflicts:
src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Diffstat (limited to 'Core/Tests/User/ChainUserProviderTest.php')
| -rw-r--r-- | Core/Tests/User/ChainUserProviderTest.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Core/Tests/User/ChainUserProviderTest.php b/Core/Tests/User/ChainUserProviderTest.php index 57873cf..ab01f47 100644 --- a/Core/Tests/User/ChainUserProviderTest.php +++ b/Core/Tests/User/ChainUserProviderTest.php @@ -12,9 +12,7 @@ namespace Symfony\Component\Security\Core\Tests\User; use Symfony\Component\Security\Core\Exception\UnsupportedUserException; - use Symfony\Component\Security\Core\User\ChainUserProvider; - use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; class ChainUserProviderTest extends \PHPUnit_Framework_TestCase |