diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-18 22:23:24 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-18 22:23:24 +0200 |
| commit | 4786bbb2ac01bb89fc7aceb36bfe8cfe05dde675 (patch) | |
| tree | 520551381cf4c892d0f67f1bfabc711b88c469ab /Http/Tests | |
| parent | 6c610f0c107159232316eb90a3fa6dd5fc42cd50 (diff) | |
| parent | ec02cc7427caf4067eab3c86f1659215f9f8440e (diff) | |
| download | symfony-security-4786bbb2ac01bb89fc7aceb36bfe8cfe05dde675.zip symfony-security-4786bbb2ac01bb89fc7aceb36bfe8cfe05dde675.tar.gz symfony-security-4786bbb2ac01bb89fc7aceb36bfe8cfe05dde675.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Routing] use constants in tests
[Process] tweaked README
[Validator] Allow an empty path in a URL with only a fragment or a query
[HttpFoundation] Fix some typo in the Request doc
fixed CS
Added separated handling of root paths
Diffstat (limited to 'Http/Tests')
| -rw-r--r-- | Http/Tests/HttpUtilsTest.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Http/Tests/HttpUtilsTest.php b/Http/Tests/HttpUtilsTest.php index 195fc48..45a0281 100644 --- a/Http/Tests/HttpUtilsTest.php +++ b/Http/Tests/HttpUtilsTest.php @@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Security\Core\Security; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Http\HttpUtils; class HttpUtilsTest extends \PHPUnit_Framework_TestCase @@ -43,7 +44,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase $urlGenerator ->expects($this->any()) ->method('generate') - ->with('foobar', array(), true) + ->with('foobar', array(), UrlGeneratorInterface::ABSOLUTE_URL) ->will($this->returnValue('http://localhost/foo/bar')) ; $urlGenerator |