Merge branch '4.3' into 4.4

* 4.3:
  [Config] Disable default alphabet sorting in glob function due of unstable sort
  [HttpClient] always return the empty string when the response cannot have a body
  [TwigBundle][exception] Added missing css variable to highlight line in trace
  [Serializer] Improve messages for unexpected resources values
  [SecurityBundle] correct types for default arguments for firewall configs

Author: nicolas-grekas

HttpClient/Test/Fixtures/web/index.php

@@ -29,15 +29,20 @@
     }
 }
 
+$json = json_encode($vars, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+
 switch ($vars['REQUEST_URI']) {
     default:
         exit;
 
+    case '/head':
+        header('Content-Length: '.strlen($json), true);
+        break;
+
     case '/':
     case '/?a=a&b=b':
     case 'http://127.0.0.1:8057/':
     case 'http://localhost:8057/':
-        header('Content-Type: application/json');
         ob_start('ob_gzhandler');
         break;
 
@@ -85,6 +90,7 @@
     case '/304':
         header('Content-Length: 10', true, 304);
         echo '12345';
+
         return;
 
     case '/307':
@@ -153,4 +159,4 @@
 
 header('Content-Type: application/json', true);
 
-echo json_encode($vars, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+echo $json;

HttpClient/Test/HttpClientTestCase.php

@@ -75,26 +75,24 @@ public function testGetRequest()
     public function testHeadRequest()
     {
         $client = $this->getHttpClient(__FUNCTION__);
-        $response = $client->request('HEAD', 'http://localhost:8057', [
+        $response = $client->request('HEAD', 'http://localhost:8057/head', [
             'headers' => ['Foo' => 'baR'],
             'user_data' => $data = new \stdClass(),
+            'buffer' => false,
         ]);
 
         $this->assertSame([], $response->getInfo('response_headers'));
-        $this->assertSame($data, $response->getInfo()['user_data']);
         $this->assertSame(200, $response->getStatusCode());
 
         $info = $response->getInfo();
-        $this->assertNull($info['error']);
-        $this->assertSame(0, $info['redirect_count']);
         $this->assertSame('HTTP/1.1 200 OK', $info['response_headers'][0]);
         $this->assertSame('Host: localhost:8057', $info['response_headers'][1]);
-        $this->assertSame('http://localhost:8057/', $info['url']);
 
         $headers = $response->getHeaders();
 
         $this->assertSame('localhost:8057', $headers['host'][0]);
         $this->assertSame(['application/json'], $headers['content-type']);
+        $this->assertTrue(0 < $headers['content-length'][0]);
 
         $this->assertSame('', $response->getContent());
     }
@@ -329,6 +327,7 @@ public function test304()
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/304', [
             'headers' => ['If-Match' => '"abc"'],
+            'buffer' => false,
         ]);
 
         $this->assertSame(304, $response->getStatusCode());