diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use brace-style regex delimiters

Browse Source
This commit is contained in:
Christian Flothmann 2018-05-03 14:15:36 +02:00 committed by Christian Flothmann
parent ffb07c6a99
commit ae62d9bc81
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -581,7 +581,7 @@ class Request
public static function setTrustedHosts(array $hostPatterns)
{
self::$trustedHostPatterns = array_map(function ($hostPattern) {
return sprintf('#%s#i', $hostPattern);
return sprintf('{%s}i', $hostPattern);
}, $hostPatterns);
// we need to reset trusted hosts on trusted host patterns change
self::$trustedHosts = array();

15
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -18,6 +18,11 @@ use Symfony\Component\HttpFoundation\Request;
class RequestTest extends TestCase
{
protected function tearDown()
{
Request::setTrustedHosts(array());
}
public function testInitialize()
{
$request = new Request();
@ -1871,9 +1876,15 @@ class RequestTest extends TestCase
$request->headers->set('host', 'subdomain.trusted.com');
$this->assertEquals('subdomain.trusted.com', $request->getHost());
}
// reset request for following tests
Request::setTrustedHosts(array());
public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
{
Request::setTrustedHosts(array('localhost(\.local){0,1}#,example.com', 'localhost'));
$request = Request::create('/');
$request->headers->set('host', 'localhost');
$this->assertSame('localhost', $request->getHost());
}
public function testFactory()