diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:40:15 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:40:15 +0100 |
| commit | b883dbdf074f070aaf67e7f6da5bb9af807f7cbd (patch) | |
| tree | af4b57fc3cdcb12555d723f22d9f8a0ed4ae92f6 /Http | |
| parent | b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9 (diff) | |
| parent | 9c2566542e03e280f62b019264becf6b74891bdc (diff) | |
| download | symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.zip symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.tar.gz symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
replaced the last remaining is_integer() call
[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
[Validator] Added missing galician (gl) translations
[travis] Tests Security sub-components
[travis] Tests Security sub-components
CS fixes
[travis] test with php nightly
Conflicts:
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Tests/Firewall/ExceptionListenerTest.php | 6 | ||||
| -rw-r--r-- | Http/Tests/Firewall/RememberMeListenerTest.php | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Http/Tests/Firewall/ExceptionListenerTest.php b/Http/Tests/Firewall/ExceptionListenerTest.php index f1409e4..6b99471 100644 --- a/Http/Tests/Firewall/ExceptionListenerTest.php +++ b/Http/Tests/Firewall/ExceptionListenerTest.php @@ -172,9 +172,9 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase private function createExceptionListener(SecurityContextInterface $context = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null) { return new ExceptionListener( - $context ? $context : $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'), - $trustResolver ? $trustResolver : $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'), - $httpUtils ? $httpUtils : $this->getMock('Symfony\Component\Security\Http\HttpUtils'), + $context ?: $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'), + $trustResolver ?: $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'), + $httpUtils ?: $this->getMock('Symfony\Component\Security\Http\HttpUtils'), 'key', $authenticationEntryPoint, $errorPage, diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php index edc27a1..12ced6b 100644 --- a/Http/Tests/Firewall/RememberMeListenerTest.php +++ b/Http/Tests/Firewall/RememberMeListenerTest.php @@ -20,7 +20,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase { public function testOnCoreSecurityDoesNotTryToPopulateNonEmptySecurityContext() { - list($listener, $context, , , ,) = $this->getListener(); + list($listener, $context) = $this->getListener(); $context ->expects($this->once()) @@ -38,7 +38,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet() { - list($listener, $context, $service, ,) = $this->getListener(); + list($listener, $context, $service) = $this->getListener(); $context ->expects($this->once()) @@ -64,7 +64,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation() { - list($listener, $context, $service, $manager,) = $this->getListener(); + list($listener, $context, $service, $manager) = $this->getListener(); $context ->expects($this->once()) @@ -144,7 +144,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase public function testOnCoreSecurity() { - list($listener, $context, $service, $manager,) = $this->getListener(); + list($listener, $context, $service, $manager) = $this->getListener(); $context ->expects($this->once()) |