Merge branch '4.4' into 5.2

* 4.4:
  fix tests (quinter)

Author: nicolas-grekas

HttpClient/Test/Fixtures/web/index.php

@@ -30,7 +30,6 @@
 }
 
 $json = json_encode($vars, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE);
-$localhost = gethostbyname('localhost');
 
 switch ($vars['REQUEST_URI']) {
     default:
@@ -42,7 +41,7 @@
 
     case '/':
     case '/?a=a&b=b':
-    case "http://$localhost:8057/":
+    case 'http://127.0.0.1:8057/':
     case 'http://localhost:8057/':
         ob_start('ob_gzhandler');
         break;
@@ -75,7 +74,7 @@
 
     case '/301':
         if ('Basic Zm9vOmJhcg==' === $vars['HTTP_AUTHORIZATION']) {
-            header("Location: http://$localhost:8057/302", true, 301);
+            header('Location: http://127.0.0.1:8057/302', true, 301);
         }
         break;
 

HttpClient/Test/HttpClientTestCase.php

@@ -334,7 +334,6 @@ public function test304()
     public function testRedirects()
     {
         $client = $this->getHttpClient(__FUNCTION__);
-        $localhost = gethostbyname('localhost');
         $response = $client->request('POST', 'http://localhost:8057/301', [
             'auth_basic' => 'foo:bar',
             'body' => function () {
@@ -352,7 +351,7 @@ public function testRedirects()
 
         $expected = [
             'HTTP/1.1 301 Moved Permanently',
-            "Location: http://$localhost:8057/302",
+            'Location: http://127.0.0.1:8057/302',
             'Content-Type: application/json',
             'HTTP/1.1 302 Found',
             'Location: http://localhost:8057/',
@@ -425,7 +424,6 @@ public function testRedirect307()
     public function testMaxRedirects()
     {
         $client = $this->getHttpClient(__FUNCTION__);
-        $localhost = gethostbyname('localhost');
         $response = $client->request('GET', 'http://localhost:8057/301', [
             'max_redirects' => 1,
             'auth_basic' => 'foo:bar',
@@ -443,7 +441,7 @@ public function testMaxRedirects()
 
         $expected = [
             'HTTP/1.1 301 Moved Permanently',
-            "Location: http://$localhost:8057/302",
+            'Location: http://127.0.0.1:8057/302',
             'Content-Type: application/json',
             'HTTP/1.1 302 Found',
             'Location: http://localhost:8057/',
@@ -692,9 +690,8 @@ public function testOnProgressError()
     public function testResolve()
     {
         $client = $this->getHttpClient(__FUNCTION__);
-        $localhost = gethostbyname('localhost');
         $response = $client->request('GET', 'http://symfony.com:8057/', [
-            'resolve' => ['symfony.com' => $localhost],
+            'resolve' => ['symfony.com' => '127.0.0.1'],
         ]);
 
         $this->assertSame(200, $response->getStatusCode());
@@ -708,16 +705,15 @@ public function testResolve()
     public function testIdnResolve()
     {
         $client = $this->getHttpClient(__FUNCTION__);
-        $localhost = gethostbyname('localhost');
 
         $response = $client->request('GET', 'http://0-------------------------------------------------------------0.com:8057/', [
-            'resolve' => ['0-------------------------------------------------------------0.com' => $localhost],
+            'resolve' => ['0-------------------------------------------------------------0.com' => '127.0.0.1'],
         ]);
 
         $this->assertSame(200, $response->getStatusCode());
 
         $response = $client->request('GET', 'http://Bücher.example:8057/', [
-            'resolve' => ['xn--bcher-kva.example' => $localhost],
+            'resolve' => ['xn--bcher-kva.example' => '127.0.0.1'],
         ]);
 
         $this->assertSame(200, $response->getStatusCode());
@@ -885,7 +881,7 @@ public function testProxy()
 
         $body = $response->toArray();
         $this->assertSame('localhost:8057', $body['HTTP_HOST']);
-        $this->assertMatchesRegularExpression('#^http://(localhost|127\.0\.\d+\.1):8057/$#', $body['REQUEST_URI']);
+        $this->assertMatchesRegularExpression('#^http://(localhost|127\.0\.0\.1):8057/$#', $body['REQUEST_URI']);
 
         $response = $client->request('GET', 'http://localhost:8057/', [
             'proxy' => 'http://foo:b%3Dar@localhost:8057',

HttpClient/Test/TestHttpServer.php

@@ -28,16 +28,15 @@ public static function start(int $port = 8057)
             });
         }
 
-        $localhost = gethostbyname('localhost');
         $finder = new PhpExecutableFinder();
-        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', "$localhost:$port"]));
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:'.$port]));
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
         $process->start();
         self::$process[$port] = $process;
 
         do {
             usleep(50000);
-        } while (!@fopen("http://$localhost:$port", 'r'));
+        } while (!@fopen('http://127.0.0.1:'.$port, 'r'));
 
         return $process;
     }