Merge branch '3.4' into 4.1

* 3.4:
  fixed tests
This commit is contained in:
Fabien Potencier 2018-09-30 06:11:26 +02:00
commit 7aba5edcd0

View File

@ -150,7 +150,7 @@ class InlineFragmentRendererTest extends TestCase
$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');
}