diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-25 11:29:59 +0100 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-25 11:29:59 +0100 |
commit | 994df31b66496c7eda68a6d98380982c62141630 (patch) | |
tree | 231ea34f9195ef8c29b403e4131f71ddc90b3c4c /Http | |
parent | 115a39f32cc0c12047778a2edf0f5e051b52da32 (diff) | |
parent | 745d367adbcaaa5d4a04d28311640b881546c05a (diff) | |
download | symfony-security-994df31b66496c7eda68a6d98380982c62141630.zip symfony-security-994df31b66496c7eda68a6d98380982c62141630.tar.gz symfony-security-994df31b66496c7eda68a6d98380982c62141630.tar.bz2 |
Merge branch '2.7'
* 2.7:
[Security/Http] fix mock logger in test
[Serializer] Fix XmlFileLoader test
[2.6] silence deprecation notices in new components
[2.5] silence deprecation notices in new components
[VarDumper] Minor fix for the uniformity
[TwigBundle] added missing absolute URL in Twig exceptions
Diffstat (limited to 'Http')
-rw-r--r-- | Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php index b4a4a34..8567728 100644 --- a/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php +++ b/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php @@ -110,10 +110,7 @@ class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->request)) ; - $this->logger = $this->getMockBuilder('Symfony\Bridge\Monolog\Logger') - ->disableOriginalConstructor() - ->getMock() - ; + $this->logger = $this->getMock('Psr\Log\LoggerInterface'); $this->securityContext = $this->getMockBuilder('Symfony\Component\Security\Core\SecurityContext') ->disableOriginalConstructor() |