Moved and extended test case

Toflar · Toflar · commit 22e7123c73fa · 2019-10-21T11:41:49.000+02:00
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -96,6 +96,7 @@ public function request(string $method, string $url, array $options = []): Respo
             'response_headers' => [],
             'url' => $url,
             'error' => null,
+            'canceled' => false,
             'http_method' => $method,
             'http_code' => 0,
             'redirect_count' => 0,
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -49,9 +49,10 @@ trait ResponseTrait
     private $content;
 
     private $info = [
-        'response_headers' => [],
-        'http_code' => 0,
+        'canceled' => false,
         'error' => null,
+        'http_code' => 0,
+        'response_headers' => [],
     ];
 
     /** @var resource */
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -114,16 +114,6 @@ public function testReentrantBufferCallback()
         $response->getContent();
     }
 
-    public function testInfoOnCanceledResponse()
-    {
-        $client = $this->getHttpClient(__FUNCTION__);
-
-        $response = $client->request('GET', 'http://localhost:8057');
-        $response->cancel();
-
-        $this->assertTrue($response->getInfo('canceled'));
-    }
-
     public function testThrowingBufferCallback()
     {
         $client = $this->getHttpClient(__FUNCTION__);
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -515,6 +515,17 @@ public function testCancel()
         $response->getHeaders();
     }
 
+    public function testInfoOnCanceledResponse()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('GET', 'http://localhost:8057/timeout-header');
+
+        $this->assertFalse($response->getInfo('canceled'));
+        $response->cancel();
+        $this->assertTrue($response->getInfo('canceled'));
+    }
+
     public function testCancelInStream()
     {
         $client = $this->getHttpClient(__FUNCTION__);
