Merge branch '3.4' into 4.1

fabpot · fabpot · commit 7aba5edcd0f3 · 2018-09-30T06:11:26.000+02:00
* 3.4:
  fixed tests
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -150,7 +150,7 @@ public function testLocaleAndFormatAreIsKeptInSubrequest()
         $expectedSubRequest = Request::create('/');
         $expectedSubRequest->attributes->set('_format', 'foo');
         $expectedSubRequest->setLocale('fr');
-        if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
+        if (Request::HEADER_CLIENT_IP & Request::getTrustedHeaderSet()) {
             $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
             $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function testLocaleAndFormatAreIsKeptInSubrequest()`
`150`	`150`	`$expectedSubRequest = Request::create('/');`
`151`	`151`	`$expectedSubRequest->attributes->set('_format', 'foo');`
`152`	`152`	`$expectedSubRequest->setLocale('fr');`
`153`		`- if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {`
	`153`	`+ if (Request::HEADER_CLIENT_IP & Request::getTrustedHeaderSet()) {`
`154`	`154`	`$expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));`
`155`	`155`	`$expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');`
`156`	`156`	`}`