Rename some vars

dunglas · dunglas · commit 90d602c25cd0 · 2019-03-14T13:46:39.000+01:00
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)
         $message = sprintf('HTTP %d returned for URL "%s".', $code, $url);
 
         $httpCodeFound = false;
-        $json = false;
+        $isJson = false;
         foreach (array_reverse($response->getInfo('raw_headers')) as $h) {
             if (0 === strpos($h, 'HTTP/')) {
                 if ($httpCodeFound) {
@@ -40,7 +40,7 @@ public function __construct(ResponseInterface $response)
 
             if (0 === stripos($h, 'content-type:')) {
                 if (preg_match('/\bjson\b/i', $h)) {
-                    $json = true;
+                    $isJson = true;
                 }
 
                 if ($httpCodeFound) {
@@ -52,15 +52,15 @@ public function __construct(ResponseInterface $response)
         // Try to guess a better error message using common API error formats
         // The MIME type isn't explicitly checked because some formats inherit from others
         // Ex: JSON:API follows RFC 7807 semantics, Hydra can be used in any JSON-LD-compatible format
-        if ($json && $body = json_decode($response->getContent(false), true)) {
+        if ($isJson && $body = json_decode($response->getContent(false), true)) {
             if (isset($body['hydra:title']) || isset($body['hydra:description'])) {
                 // see http://www.hydra-cg.com/spec/latest/core/#description-of-http-status-codes-and-errors
-                $sep = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
-                $message = ($body['hydra:title'] ?? '').$sep.($body['hydra:description'] ?? '');
+                $separator = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
+                $message = ($body['hydra:title'] ?? '').$separator.($body['hydra:description'] ?? '');
             } elseif (isset($body['title']) || isset($body['detail'])) {
                 // see RFC 7807 and https://jsonapi.org/format/#error-objects
-                $sep = isset($body['title'], $body['detail']) ? "\n\n" : '';
-                $message = ($body['title'] ?? '').$sep.($body['detail'] ?? '');
+                $separator = isset($body['title'], $body['detail']) ? "\n\n" : '';
+                $message = ($body['title'] ?? '').$separator.($body['detail'] ?? '');
             }
         }
 
