diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:53:49 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:53:49 +0100 |
commit | a57c25800dcd39387a9a831ef8f436a6bebb8e72 (patch) | |
tree | 536a2ddb082b1cd251fdc04ff8d9e5700593f805 /Http/Tests/AccessMapTest.php | |
parent | 05b01b879902a75c64b610a28d1f0dc0bee58c91 (diff) | |
parent | 674b38ff1ae98e993fd18e599120ead43705c4bc (diff) | |
download | symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.zip symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.tar.gz symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.tar.bz2 |
Merge branch '2.8' into 3.1
* 2.8:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
Diffstat (limited to 'Http/Tests/AccessMapTest.php')
-rw-r--r-- | Http/Tests/AccessMapTest.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Http/Tests/AccessMapTest.php b/Http/Tests/AccessMapTest.php index d8ab7aa..b71ad85 100644 --- a/Http/Tests/AccessMapTest.php +++ b/Http/Tests/AccessMapTest.php @@ -17,7 +17,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase { public function testReturnsFirstMatchedPattern() { - $request = $this->getMock('Symfony\Component\HttpFoundation\Request'); + $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(); $requestMatcher1 = $this->getRequestMatcher($request, false); $requestMatcher2 = $this->getRequestMatcher($request, true); @@ -30,7 +30,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase public function testReturnsEmptyPatternIfNoneMatched() { - $request = $this->getMock('Symfony\Component\HttpFoundation\Request'); + $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(); $requestMatcher = $this->getRequestMatcher($request, false); $map = new AccessMap(); @@ -41,7 +41,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase private function getRequestMatcher($request, $matches) { - $requestMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcherInterface'); + $requestMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcherInterface')->getMock(); $requestMatcher->expects($this->once()) ->method('matches')->with($request) ->will($this->returnValue($matches)); |