diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:23:51 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:23:51 +0100 |
| commit | 3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6 (patch) | |
| tree | 7d51e93b2ff5e382921803e326452f462df0eb57 | |
| parent | 99eaad2b772342dd09fd0498340bc2a675644082 (diff) | |
| parent | 0e0bddb6cd3fda22a89662fd2476d05f11d10fef (diff) | |
| download | symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.zip symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.tar.gz symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] Remove useless tests skips
[2.3] Cleanup deprecations
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/Debug/Tests/MockExceptionHandler.php
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Security/composer.json
| -rw-r--r-- | Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php | 4 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php index 1fb7350..7b24e61 100644 --- a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php +++ b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php @@ -55,10 +55,6 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase public function testHandledEventIsLogged() { - if (!interface_exists('Psr\Log\LoggerInterface')) { - $this->markTestSkipped('The "LoggerInterface" is not available'); - } - $context = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'); $logger = $this->getMock('Psr\Log\LoggerInterface'); $logger->expects($this->once()) diff --git a/composer.json b/composer.json index 42eedd5..bd323fa 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "symfony/security-http": "self.version" }, "require-dev": { - "symfony/locale": "~2.0,>=2.0.5", + "symfony/intl": "~2.3", "symfony/routing": "~2.2", "symfony/translation": "~2.0,>=2.0.5", "symfony/validator": "~2.5,>=2.5.5", |