bug #31586 [HttpClient] display proper error message on TransportException when curl is used (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 90ca404cc944 · 2019-05-23T09:00:44.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] display proper error message on TransportException when curl is used | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Reported independently by @GawainLynch and @tgalopin: the message of TransportException is currently empty when using CurlHttpClient. This now displays e.g. ``` [Symfony\Component\HttpClient\Exception\TransportException] Couldn't connect to server for http://localhost:8000/index.html ``` Commits ------- 3273109 [HttpClient] display proper error message on TransportException when curl is used
diff --git a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
@@ -27,7 +27,7 @@ public function __construct(ResponseInterface $response)
         $this->response = $response;
         $code = $response->getInfo('http_code');
         $url = $response->getInfo('url');
-        $message = sprintf('HTTP %d returned for URL "%s".', $code, $url);
+        $message = sprintf('HTTP %d returned for "%s".', $code, $url);
 
         $httpCodeFound = false;
         $isJson = false;
@@ -37,7 +37,7 @@ public function __construct(ResponseInterface $response)
                     break;
                 }
 
-                $message = sprintf('%s returned for URL "%s".', $h, $url);
+                $message = sprintf('%s returned for "%s".', $h, $url);
                 $httpCodeFound = true;
             }
 
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -245,7 +245,7 @@ private static function perform(CurlClientState $multi, array &$responses = null
 
             while ($info = curl_multi_info_read($multi->handle)) {
                 $multi->handlesActivity[(int) $info['handle']][] = null;
-                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) || (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));
+                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) || (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(sprintf('%s for"%s".', curl_strerror($info['result']), curl_getinfo($info['handle'], CURLINFO_EFFECTIVE_URL)));
             }
         } finally {
             self::$performing = false;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(ResponseInterface $response)`
`27`	`27`	`$this->response = $response;`
`28`	`28`	`$code = $response->getInfo('http_code');`
`29`	`29`	`$url = $response->getInfo('url');`
`30`		`- $message = sprintf('HTTP %d returned for URL "%s".', $code, $url);`
	`30`	`+ $message = sprintf('HTTP %d returned for "%s".', $code, $url);`
`31`	`31`
`32`	`32`	`$httpCodeFound = false;`
`33`	`33`	`$isJson = false;`
`@@ -37,7 +37,7 @@ public function __construct(ResponseInterface $response)`
`37`	`37`	`break;`
`38`	`38`	`}`
`39`	`39`
`40`		`- $message = sprintf('%s returned for URL "%s".', $h, $url);`
	`40`	`+ $message = sprintf('%s returned for "%s".', $h, $url);`
`41`	`41`	`$httpCodeFound = true;`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ private static function perform(CurlClientState $multi, array &$responses = null`
`245`	`245`
`246`	`246`	`while ($info = curl_multi_info_read($multi->handle)) {`
`247`	`247`	`$multi->handlesActivity[(int) $info['handle']][] = null;`
`248`		`- $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) \|\| (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));`
	`248`	`+ $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) \|\| (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(sprintf('%s for"%s".', curl_strerror($info['result']), curl_getinfo($info['handle'], CURLINFO_EFFECTIVE_URL)));`
`249`	`249`	`}`
`250`	`250`	`} finally {`
`251`	`251`	`self::$performing = false;`