diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-11 11:41:17 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-11 11:41:51 +0100 |
| commit | 94149fa4eadb815a898537129c7ac2a512fd721e (patch) | |
| tree | 7464bea5bb8cfcdc0711a8c3b8d4234410f6c9b2 /Tests/Http | |
| parent | 7c66d5298e8a153f3c3a658543ca2a699c0cb98b (diff) | |
| parent | 78e25f39b81ccadc5ead77f2c1e1099492875a9c (diff) | |
| download | symfony-security-94149fa4eadb815a898537129c7ac2a512fd721e.zip symfony-security-94149fa4eadb815a898537129c7ac2a512fd721e.tar.gz symfony-security-94149fa4eadb815a898537129c7ac2a512fd721e.tar.bz2 | |
Merge branch '2.1'
* 2.1:
fixed CS
fixed CS
[Security] fixed path info encoding (closes #6040, closes #5695)
[HttpFoundation] added some tests for the previous merge and removed dead code (closes #6037)
Improved Cache-Control header when no-cache is sent
removed unneeded comment
Fix to allow null values in labels array
fix date in changelog
removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" (closes #6224)
Fixed a typo
Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
[Form] Fix const inside an anonymous function
[Config] Loader::import must return imported data
[DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
[Form] Fixed the default value of "format" in DateType to DateType::DEFAULT_FORMAT if "widget" is not "single_text"
[HttpFoundation] fixed a small regression
Conflicts:
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
Diffstat (limited to 'Tests/Http')
| -rw-r--r-- | Tests/Http/HttpUtilsTest.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Tests/Http/HttpUtilsTest.php b/Tests/Http/HttpUtilsTest.php index a30051f..fc1b754 100644 --- a/Tests/Http/HttpUtilsTest.php +++ b/Tests/Http/HttpUtilsTest.php @@ -97,6 +97,11 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase $this->assertTrue($utils->checkRequestPath($this->getRequest(), '/')); $this->assertFalse($utils->checkRequestPath($this->getRequest(), '/foo')); + $this->assertTrue($utils->checkRequestPath($this->getRequest('/foo%20bar'), '/foo bar')); + // Plus must not decoded to space + $this->assertTrue($utils->checkRequestPath($this->getRequest('/foo+bar'), '/foo+bar')); + // Checking unicode + $this->assertTrue($utils->checkRequestPath($this->getRequest(urlencode('/вход')), '/вход')); $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface'); $urlMatcher |