Merge branch '4.4' into 5.0

fabpot · fabpot · commit 2964cc50e9c4 · 2020-03-16T13:10:54.000+01:00
* 4.4:
  Fix quotes in exception messages
  Fix quotes in exception messages
  Fix quotes in exception messages
diff --git a/CachingHttpClient.php b/CachingHttpClient.php
@@ -114,7 +114,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
         if ($responses instanceof ResponseInterface) {
             $responses = [$responses];
         } elseif (!is_iterable($responses)) {
-            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of ResponseInterface objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
+            throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of ResponseInterface objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
         }
 
         $mockResponses = [];
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -156,14 +156,14 @@ public function request(string $method, string $url, array $options = []): Respo
             if (\is_array($options['auth_ntlm'])) {
                 $count = \count($options['auth_ntlm']);
                 if ($count <= 0 || $count > 2) {
-                    throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %s given.', $count));
+                    throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %d given.', $count));
                 }
 
                 $options['auth_ntlm'] = implode(':', $options['auth_ntlm']);
             }
 
             if (!\is_string($options['auth_ntlm'])) {
-                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, %s given.', \gettype($options['auth_ntlm'])));
+                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, "%s" given.', \gettype($options['auth_ntlm'])));
             }
 
             $curlopts[CURLOPT_USERPWD] = $options['auth_ntlm'];
@@ -319,7 +319,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
         if ($responses instanceof CurlResponse) {
             $responses = [$responses];
         } elseif (!is_iterable($responses)) {
-            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
+            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
         }
 
         $active = 0;
@@ -439,7 +439,7 @@ private static function readRequestBody(int $length, \Closure $body, string &$bu
     {
         if (!$eof && \strlen($buffer) < $length) {
             if (!\is_string($data = $body($length))) {
-                throw new TransportException(sprintf('The return value of the "body" option callback must be a string, %s returned.', \gettype($data)));
+                throw new TransportException(sprintf('The return value of the "body" option callback must be a string, "%s" returned.', \gettype($data)));
             }
 
             $buffer .= $data;
diff --git a/HttpClientTrait.php b/HttpClientTrait.php
@@ -48,7 +48,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             $options['buffer'] = static function (array $headers) use ($buffer) {
                 if (!\is_bool($buffer = $buffer($headers))) {
                     if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) {
-                        throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got %s.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));
+                        throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got "%s".', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));
                     }
 
                     if (false === strpbrk($bufferInfo['mode'], 'acew+')) {
@@ -60,7 +60,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             };
         } elseif (!\is_bool($buffer)) {
             if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) {
-                throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, %s given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));
+                throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, "%s" given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));
             }
 
             if (false === strpbrk($bufferInfo['mode'], 'acew+')) {
@@ -94,24 +94,24 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         // Validate on_progress
         if (!\is_callable($onProgress = $options['on_progress'] ?? 'var_dump')) {
-            throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, %s given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress)));
+            throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, "%s" given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress)));
         }
 
         if (\is_array($options['auth_basic'] ?? null)) {
             $count = \count($options['auth_basic']);
             if ($count <= 0 || $count > 2) {
-                throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, %s given.', $count));
+                throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, "%s" given.', $count));
             }
 
             $options['auth_basic'] = implode(':', $options['auth_basic']);
         }
 
         if (!\is_string($options['auth_basic'] ?? '')) {
-            throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic'])));
+            throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, "%s" given.', \gettype($options['auth_basic'])));
         }
 
         if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {
-            throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer'])));
+            throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : '"'.\gettype($options['auth_bearer']).'"'));
         }
 
         if (isset($options['auth_basic'], $options['auth_bearer'])) {
@@ -206,10 +206,10 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
             }
 
             if ('auth_ntlm' === $name) {
-                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by %s, try using CurlHttpClient instead.', __CLASS__));
+                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", try using CurlHttpClient instead.', __CLASS__));
             }
 
-            throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to %s, did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));
+            throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to "%s", did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));
         }
 
         return $options;
@@ -231,13 +231,13 @@ private static function normalizeHeaders(array $headers): array
 
             if (\is_int($name)) {
                 if (!\is_string($values)) {
-                    throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \gettype($values)));
+                    throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \gettype($values)));
                 }
                 [$name, $values] = explode(':', $values, 2);
                 $values = [ltrim($values)];
             } elseif (!is_iterable($values)) {
                 if (\is_object($values)) {
-                    throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \get_class($values)));
+                    throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \get_class($values)));
                 }
 
                 $values = (array) $values;
@@ -299,7 +299,7 @@ private static function normalizeBody($body)
         }
 
         if (!\is_string($body) && !\is_array(@stream_get_meta_data($body))) {
-            throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, %s given.', \is_resource($body) ? get_resource_type($body) : \gettype($body)));
+            throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, "%s" given.', \is_resource($body) ? get_resource_type($body) : \gettype($body)));
         }
 
         return $body;
@@ -325,7 +325,7 @@ private static function normalizePeerFingerprint($fingerprint): array
                 $fingerprint[$algo] = 'pin-sha256' === $algo ? (array) $hash : str_replace(':', '', $hash);
             }
         } else {
-            throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, %s given.', \gettype($fingerprint)));
+            throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, "%s" given.', \gettype($fingerprint)));
         }
 
         return $fingerprint;
diff --git a/HttplugClient.php b/HttplugClient.php
@@ -184,7 +184,7 @@ public function createStream($body = null): StreamInterface
         } elseif (\is_resource($body)) {
             $stream = $this->streamFactory->createStreamFromResource($body);
         } else {
-            throw new \InvalidArgumentException(sprintf('%s() expects string, resource or StreamInterface, %s given.', __METHOD__, \gettype($body)));
+            throw new \InvalidArgumentException(sprintf('"%s()" expects string, resource or StreamInterface, "%s" given.', __METHOD__, \gettype($body)));
         }
 
         if ($stream->isSeekable()) {
diff --git a/MockHttpClient.php b/MockHttpClient.php
@@ -79,7 +79,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
         if ($responses instanceof ResponseInterface) {
             $responses = [$responses];
         } elseif (!is_iterable($responses)) {
-            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
+            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
         }
 
         return new ResponseStream(MockResponse::stream($responses, $timeout));
diff --git a/NativeHttpClient.php b/NativeHttpClient.php
@@ -238,7 +238,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa
         if ($responses instanceof NativeResponse) {
             $responses = [$responses];
         } elseif (!is_iterable($responses)) {
-            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
+            throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
         }
 
         return new ResponseStream(NativeResponse::stream($responses, $timeout));
@@ -258,7 +258,7 @@ private static function getBodyAsString($body): string
 
         while ('' !== $data = $body(self::$CHUNK_SIZE)) {
             if (!\is_string($data)) {
-                throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data)));
+                throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data)));
             }
 
             $result .= $data;
diff --git a/Response/MockResponse.php b/Response/MockResponse.php
@@ -228,7 +228,7 @@ private static function writeRequest(self $response, array $options, ResponseInt
         } elseif ($body instanceof \Closure) {
             while ('' !== $data = $body(16372)) {
                 if (!\is_string($data)) {
-                    throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data)));
+                    throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data)));
                 }
 
                 // "notify" upload progress
@@ -295,7 +295,7 @@ private static function readResponse(self $response, array $options, ResponseInt
         $onProgress($offset, $dlSize, $response->info);
 
         if ($dlSize && $offset !== $dlSize) {
-            throw new TransportException(sprintf('Transfer closed with %s bytes remaining to read.', $dlSize - $offset));
+            throw new TransportException(sprintf('Transfer closed with %d bytes remaining to read.', $dlSize - $offset));
         }
     }
 }
diff --git a/Response/ResponseTrait.php b/Response/ResponseTrait.php
@@ -161,7 +161,7 @@ public function toArray(bool $throw = true): array
         }
 
         if (!\is_array($content)) {
-            throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned for "%s".', \gettype($content), $this->getInfo('url')));
+            throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned for "%s".', \gettype($content), $this->getInfo('url')));
         }
 
         if (null !== $this->content) {
diff --git a/Tests/HttpClientTraitTest.php b/Tests/HttpClientTraitTest.php
@@ -179,7 +179,7 @@ public function testAuthBearerOption()
     public function testInvalidAuthBearerOption()
     {
         $this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, object given.');
+        $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, "object" given.');
         self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => new \stdClass()], HttpClientInterface::OPTIONS_DEFAULTS);
     }
 
@@ -249,7 +249,7 @@ public function testNormalizePeerFingerprintException()
     public function testNormalizePeerFingerprintTypeException()
     {
         $this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, object given.');
+        $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, "object" given.');
         $fingerprint = new \stdClass();
 
         $this->normalizePeerFingerprint($fingerprint);
diff --git a/Tests/Response/MockResponseTest.php b/Tests/Response/MockResponseTest.php
@@ -56,13 +56,13 @@ public function toArrayErrors()
         yield [
             'content' => '"not an array"',
             'responseHeaders' => [],
-            'message' => 'JSON content was expected to decode to an array, string returned for "https://example.com/file.json".',
+            'message' => 'JSON content was expected to decode to an array, "string" returned for "https://example.com/file.json".',
         ];
 
         yield [
             'content' => '8',
             'responseHeaders' => [],
-            'message' => 'JSON content was expected to decode to an array, integer returned for "https://example.com/file.json".',
+            'message' => 'JSON content was expected to decode to an array, "integer" returned for "https://example.com/file.json".',
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa`
`114`	`114`	`if ($responses instanceof ResponseInterface) {`
`115`	`115`	`$responses = [$responses];`
`116`	`116`	`} elseif (!is_iterable($responses)) {`
`117`		`- throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of ResponseInterface objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
	`117`	`+ throw new \TypeError(sprintf('"%s()" expects parameter 1 to be an iterable of ResponseInterface objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`$mockResponses = [];`
Original file line number	Diff line number	Diff line change
`@@ -156,14 +156,14 @@ public function request(string $method, string $url, array $options = []): Respo`
`156`	`156`	`if (\is_array($options['auth_ntlm'])) {`
`157`	`157`	`$count = \count($options['auth_ntlm']);`
`158`	`158`	`if ($count <= 0 \|\| $count > 2) {`
`159`		`- throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %s given.', $count));`
	`159`	`+ throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must contain 1 or 2 elements, %d given.', $count));`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`$options['auth_ntlm'] = implode(':', $options['auth_ntlm']);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if (!\is_string($options['auth_ntlm'])) {`
`166`		`- throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, %s given.', \gettype($options['auth_ntlm'])));`
	`166`	`+ throw new InvalidArgumentException(sprintf('Option "auth_ntlm" must be a string or an array, "%s" given.', \gettype($options['auth_ntlm'])));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`$curlopts[CURLOPT_USERPWD] = $options['auth_ntlm'];`
`@@ -319,7 +319,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa`
`319`	`319`	`if ($responses instanceof CurlResponse) {`
`320`	`320`	`$responses = [$responses];`
`321`	`321`	`} elseif (!is_iterable($responses)) {`
`322`		`- throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
	`322`	`+ throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`$active = 0;`
`@@ -439,7 +439,7 @@ private static function readRequestBody(int $length, \Closure $body, string &$bu`
`439`	`439`	`{`
`440`	`440`	`if (!$eof && \strlen($buffer) < $length) {`
`441`	`441`	`if (!\is_string($data = $body($length))) {`
`442`		`- throw new TransportException(sprintf('The return value of the "body" option callback must be a string, %s returned.', \gettype($data)));`
	`442`	`+ throw new TransportException(sprintf('The return value of the "body" option callback must be a string, "%s" returned.', \gettype($data)));`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`$buffer .= $data;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`48`	`48`	`$options['buffer'] = static function (array $headers) use ($buffer) {`
`49`	`49`	`if (!\is_bool($buffer = $buffer($headers))) {`
`50`	`50`	`if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) {`
`51`		`- throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got %s.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));`
	`51`	`+ throw new \LogicException(sprintf('The closure passed as option "buffer" must return bool or stream resource, got "%s".', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (false === strpbrk($bufferInfo['mode'], 'acew+')) {`
`@@ -60,7 +60,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`60`	`60`	`};`
`61`	`61`	`} elseif (!\is_bool($buffer)) {`
`62`	`62`	`if (!\is_array($bufferInfo = @stream_get_meta_data($buffer))) {`
`63`		`- throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, %s given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));`
	`63`	`+ throw new InvalidArgumentException(sprintf('Option "buffer" must be bool, stream resource or Closure, "%s" given.', \is_resource($buffer) ? get_resource_type($buffer).' resource' : \gettype($buffer)));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (false === strpbrk($bufferInfo['mode'], 'acew+')) {`
`@@ -94,24 +94,24 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`94`	`94`
`95`	`95`	`// Validate on_progress`
`96`	`96`	`if (!\is_callable($onProgress = $options['on_progress'] ?? 'var_dump')) {`
`97`		`- throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, %s given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress)));`
	`97`	`+ throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, "%s" given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress)));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (\is_array($options['auth_basic'] ?? null)) {`
`101`	`101`	`$count = \count($options['auth_basic']);`
`102`	`102`	`if ($count <= 0 \|\| $count > 2) {`
`103`		`- throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, %s given.', $count));`
	`103`	`+ throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, "%s" given.', $count));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$options['auth_basic'] = implode(':', $options['auth_basic']);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (!\is_string($options['auth_basic'] ?? '')) {`
`110`		`- throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic'])));`
	`110`	`+ throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, "%s" given.', \gettype($options['auth_basic'])));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) \|\| !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {`
`114`		`- throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer'])));`
	`114`	`+ throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : '"'.\gettype($options['auth_bearer']).'"'));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`if (isset($options['auth_basic'], $options['auth_bearer'])) {`
`@@ -206,10 +206,10 @@ private static function mergeDefaultOptions(array $options, array $defaultOption`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`if ('auth_ntlm' === $name) {`
`209`		`- throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by %s, try using CurlHttpClient instead.', __CLASS__));`
	`209`	`+ throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", try using CurlHttpClient instead.', __CLASS__));`
`210`	`210`	`}`
`211`	`211`
`212`		`- throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to %s, did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));`
	`212`	`+ throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to "%s", did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`return $options;`
`@@ -231,13 +231,13 @@ private static function normalizeHeaders(array $headers): array`
`231`	`231`
`232`	`232`	`if (\is_int($name)) {`
`233`	`233`	`if (!\is_string($values)) {`
`234`		`- throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \gettype($values)));`
	`234`	`+ throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \gettype($values)));`
`235`	`235`	`}`
`236`	`236`	`[$name, $values] = explode(':', $values, 2);`
`237`	`237`	`$values = [ltrim($values)];`
`238`	`238`	`} elseif (!is_iterable($values)) {`
`239`	`239`	`if (\is_object($values)) {`
`240`		`- throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, %s given.', $name, \get_class($values)));`
	`240`	`+ throw new InvalidArgumentException(sprintf('Invalid value for header "%s": expected string, "%s" given.', $name, \get_class($values)));`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`$values = (array) $values;`
`@@ -299,7 +299,7 @@ private static function normalizeBody($body)`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`if (!\is_string($body) && !\is_array(@stream_get_meta_data($body))) {`
`302`		`- throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, %s given.', \is_resource($body) ? get_resource_type($body) : \gettype($body)));`
	`302`	`+ throw new InvalidArgumentException(sprintf('Option "body" must be string, stream resource, iterable or callable, "%s" given.', \is_resource($body) ? get_resource_type($body) : \gettype($body)));`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`return $body;`
`@@ -325,7 +325,7 @@ private static function normalizePeerFingerprint($fingerprint): array`
`325`	`325`	`$fingerprint[$algo] = 'pin-sha256' === $algo ? (array) $hash : str_replace(':', '', $hash);`
`326`	`326`	`}`
`327`	`327`	`} else {`
`328`		`- throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, %s given.', \gettype($fingerprint)));`
	`328`	`+ throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, "%s" given.', \gettype($fingerprint)));`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`return $fingerprint;`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function createStream($body = null): StreamInterface`
`184`	`184`	`} elseif (\is_resource($body)) {`
`185`	`185`	`$stream = $this->streamFactory->createStreamFromResource($body);`
`186`	`186`	`} else {`
`187`		`- throw new \InvalidArgumentException(sprintf('%s() expects string, resource or StreamInterface, %s given.', __METHOD__, \gettype($body)));`
	`187`	`+ throw new \InvalidArgumentException(sprintf('"%s()" expects string, resource or StreamInterface, "%s" given.', __METHOD__, \gettype($body)));`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if ($stream->isSeekable()) {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa`
`79`	`79`	`if ($responses instanceof ResponseInterface) {`
`80`	`80`	`$responses = [$responses];`
`81`	`81`	`} elseif (!is_iterable($responses)) {`
`82`		`- throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
	`82`	`+ throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`return new ResponseStream(MockResponse::stream($responses, $timeout));`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function stream($responses, float $timeout = null): ResponseStreamInterfa`
`238`	`238`	`if ($responses instanceof NativeResponse) {`
`239`	`239`	`$responses = [$responses];`
`240`	`240`	`} elseif (!is_iterable($responses)) {`
`241`		`- throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
	`241`	`+ throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, "%s" given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`return new ResponseStream(NativeResponse::stream($responses, $timeout));`
`@@ -258,7 +258,7 @@ private static function getBodyAsString($body): string`
`258`	`258`
`259`	`259`	`while ('' !== $data = $body(self::$CHUNK_SIZE)) {`
`260`	`260`	`if (!\is_string($data)) {`
`261`		`- throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data)));`
	`261`	`+ throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data)));`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`$result .= $data;`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ private static function writeRequest(self $response, array $options, ResponseInt`
`228`	`228`	`} elseif ($body instanceof \Closure) {`
`229`	`229`	`while ('' !== $data = $body(16372)) {`
`230`	`230`	`if (!\is_string($data)) {`
`231`		`- throw new TransportException(sprintf('Return value of the "body" option callback must be string, %s returned.', \gettype($data)));`
	`231`	`+ throw new TransportException(sprintf('Return value of the "body" option callback must be string, "%s" returned.', \gettype($data)));`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`// "notify" upload progress`
`@@ -295,7 +295,7 @@ private static function readResponse(self $response, array $options, ResponseInt`
`295`	`295`	`$onProgress($offset, $dlSize, $response->info);`
`296`	`296`
`297`	`297`	`if ($dlSize && $offset !== $dlSize) {`
`298`		`- throw new TransportException(sprintf('Transfer closed with %s bytes remaining to read.', $dlSize - $offset));`
	`298`	`+ throw new TransportException(sprintf('Transfer closed with %d bytes remaining to read.', $dlSize - $offset));`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function toArray(bool $throw = true): array`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`if (!\is_array($content)) {`
`164`		`- throw new JsonException(sprintf('JSON content was expected to decode to an array, %s returned for "%s".', \gettype($content), $this->getInfo('url')));`
	`164`	`+ throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned for "%s".', \gettype($content), $this->getInfo('url')));`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (null !== $this->content) {`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function testAuthBearerOption()`
`179`	`179`	`public function testInvalidAuthBearerOption()`
`180`	`180`	`{`
`181`	`181`	`$this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException');`
`182`		`- $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, object given.');`
	`182`	`+ $this->expectExceptionMessage('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, "object" given.');`
`183`	`183`	`self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => new \stdClass()], HttpClientInterface::OPTIONS_DEFAULTS);`
`184`	`184`	`}`
`185`	`185`
`@@ -249,7 +249,7 @@ public function testNormalizePeerFingerprintException()`
`249`	`249`	`public function testNormalizePeerFingerprintTypeException()`
`250`	`250`	`{`
`251`	`251`	`$this->expectException('Symfony\Component\HttpClient\Exception\InvalidArgumentException');`
`252`		`- $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, object given.');`
	`252`	`+ $this->expectExceptionMessage('Option "peer_fingerprint" must be string or array, "object" given.');`
`253`	`253`	`$fingerprint = new \stdClass();`
`254`	`254`
`255`	`255`	`$this->normalizePeerFingerprint($fingerprint);`