[HttpClient] Add tests - update code style nits.

Author: Kyra Farrow

CachingHttpClient.php

@@ -71,7 +71,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $url = implode('', $url);
         $options['extra']['no_cache'] = $options['extra']['no_cache'] ?? !$options['buffer'];
 
-        if ($options['extra']['no_cache'] || !empty($options['body']) || !\in_array($method, ['GET', 'HEAD', 'OPTIONS'])) {
+        if (!empty($options['body']) || $options['extra']['no_cache'] || !\in_array($method, ['GET', 'HEAD', 'OPTIONS'])) {
             return $this->client->request($method, $url, $options);
         }
 

CurlHttpClient.php

@@ -48,6 +48,10 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface
      */
     public function __construct(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50)
     {
+        if (!\extension_loaded('curl')) {
+            throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\CurlHttpClient" as the "curl" extension is not installed.');
+        }
+
         if ($defaultOptions) {
             [, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, self::OPTIONS_DEFAULTS);
         }
@@ -109,7 +113,7 @@ public function request(string $method, string $url, array $options = []): Respo
                 $options['headers']['range'] ?? null,
             ];
 
-            if ('GET' === $method && !$options['body'] && $expectedHeaders === $pushedHeaders) {
+            if ('GET' === $method && $expectedHeaders === $pushedHeaders && !$options['body']) {
                 $this->logger && $this->logger->debug(sprintf('Connecting request to pushed response: "%s %s"', $method, $url));
 
                 // Reinitialize the pushed response with request's options

HttpClientTrait.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpClient;
 
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Provides the common logic from writing HttpClientInterface implementations.
@@ -278,7 +277,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($body)));
+            throw new InvalidArgumentException(sprintf('Option "peer_fingerprint" must be string or array, %s given.', \gettype($fingerprint)));
         }
 
         return $fingerprint;

HttpOptions.php

@@ -37,6 +37,7 @@ public function toArray(): array
     public function setAuthBasic(string $user, string $password = '')
     {
         $this->options['auth_basic'] = $user;
+
         if ('' !== $password) {
             $this->options['auth_basic'] .= ':'.$password;
         }

MockHttpClient.php

@@ -39,7 +39,7 @@ public function __construct($responseFactory = null, string $baseUri = null)
             $responseFactory = [$responseFactory];
         }
 
-        if (null !== $responseFactory && !\is_callable($responseFactory) && !$responseFactory instanceof \Iterator) {
+        if (!$responseFactory instanceof \Iterator && null !== $responseFactory && !\is_callable($responseFactory)) {
             $responseFactory = (static function () use ($responseFactory) {
                 yield from $responseFactory;
             })();

NativeHttpClient.php

@@ -400,17 +400,9 @@ private static function configureHeadersAndProxy($context, string $host, array $
         // Matching "no_proxy" should follow the behavior of curl
 
         foreach ($noProxy as $rule) {
-            if ('*' === $rule) {
-                return stream_context_set_option($context, 'http', 'header', $requestHeaders);
-            }
-
-            if ($host === $rule) {
-                return stream_context_set_option($context, 'http', 'header', $requestHeaders);
-            }
-
-            $rule = '.'.ltrim($rule, '.');
+            $dotRule = '.'.ltrim($rule, '.');
 
-            if (substr($host, -\strlen($rule)) === $rule) {
+            if ('*' === $rule || $host === $rule || substr($host, -\strlen($dotRule)) === $dotRule) {
                 return stream_context_set_option($context, 'http', 'header', $requestHeaders);
             }
         }

Tests/HttpClientTraitTest.php

@@ -215,4 +215,42 @@ public function testPrepareAuthBasic($arg, $result)
         [, $options] = $this->prepareRequest('POST', 'http://example.com', ['auth_basic' => $arg], HttpClientInterface::OPTIONS_DEFAULTS);
         $this->assertSame('Basic '.$result, $options['headers']['authorization'][0]);
     }
+
+    public function provideFingerprints()
+    {
+        foreach (['md5', 'sha1', 'sha256'] as $algo) {
+            $hash = \hash($algo, $algo);
+            yield [$hash, [$algo => $hash]];
+        }
+
+        yield ['AAAA:BBBB:CCCC:DDDD:EEEE:FFFF:GGGG:HHHH:IIII:JJJJ:KKKK', ['pin-sha256' => ['AAAABBBBCCCCDDDDEEEEFFFFGGGGHHHHIIIIJJJJKKKK']]];
+    }
+
+    /**
+     * @dataProvider provideFingerprints
+     */
+    public function testNormalizePeerFingerprint($fingerprint, $expected)
+    {
+        self::assertSame($expected, $this->normalizePeerFingerprint($fingerprint));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\HttpClient\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Cannot auto-detect fingerprint algorithm for "foo".
+     */
+    public function testNormalizePeerFingerprintException()
+    {
+        $this->normalizePeerFingerprint('foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\HttpClient\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Option "peer_fingerprint" must be string or array, object given.
+     */
+    public function testNormalizePeerFingerprintTypeException()
+    {
+        $fingerprint = new \stdClass();
+
+        $this->normalizePeerFingerprint($fingerprint);
+    }
 }