[HttpClient] Minor fixes

fancyweb · fancyweb · commit 356341bc1965 · 2019-08-05T15:12:03.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1481,7 +1481,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                         ->info('A comma separated list of hosts that do not require a proxy to be reached.')
                                     ->end()
                                     ->floatNode('timeout')
-                                        ->info('Defaults to "default_socket_timeout" ini parameter.')
+                                        ->info('The idle timeout, defaults to the "default_socket_timeout" ini parameter.')
                                     ->end()
                                     ->scalarNode('bindto')
                                         ->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -37,7 +37,7 @@ class MockResponse implements ResponseInterface
 
     /**
      * @param string|string[]|iterable $body The response body as a string or an iterable of strings,
-     *                                       yielding an empty string simulates a timeout,
+     *                                       yielding an empty string simulates an idle timeout,
      *                                       exceptions are turned to TransportException
      *
      * @see ResponseInterface::getInfo() for possible info, e.g. "response_headers"
@@ -277,7 +277,7 @@ private static function readResponse(self $response, array $options, ResponseInt
         if (!\is_string($body)) {
             foreach ($body as $chunk) {
                 if ('' === $chunk = (string) $chunk) {
-                    // simulate a timeout
+                    // simulate an idle timeout
                     $response->body[] = new ErrorChunk($offset);
                 } else {
                     $response->body[] = $chunk;
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -580,7 +580,7 @@ public function testResolve()
 
         $response = null;
         $this->expectException(TransportExceptionInterface::class);
-        $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 3]);
+        $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 1]);
     }
 
     public function testTimeoutOnAccess()
@@ -643,7 +643,6 @@ public function testDestruct()
     {
         $client = $this->getHttpClient(__FUNCTION__);
 
-        $downloaded = 0;
         $start = microtime(true);
         $client->request('GET', 'http://localhost:8057/timeout-long');
         $client = null;

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ public function testResolve()`
`580`	`580`
`581`	`581`	`$response = null;`
`582`	`582`	`$this->expectException(TransportExceptionInterface::class);`
`583`		`- $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 3]);`
	`583`	`+ $client->request('GET', 'http://symfony.com:8057/', ['timeout' => 1]);`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`public function testTimeoutOnAccess()`
`@@ -643,7 +643,6 @@ public function testDestruct()`
`643`	`643`	`{`
`644`	`644`	`$client = $this->getHttpClient(__FUNCTION__);`
`645`	`645`
`646`		`- $downloaded = 0;`
`647`	`646`	`$start = microtime(true);`
`648`	`647`	`$client->request('GET', 'http://localhost:8057/timeout-long');`
`649`	`648`	`$client = null;`