Merge branch '4.4'

* 4.4:
  extend legacy exception for backwards compatibility
  [HttpClient] workaround curl_multi_select() issue
  [CI] fix building local packages
  Add show-deprecations option to lint:twig command
  [HttpClient] try using php-http/discovery when nyholm/psr7 is not installed
  [FrameworkBundle] Improve the sorting of tagged services
  [HttpClient] add HttpClient::createForBaseUri()
  Increase limits for flakey appveyor tests

Author: nicolas-grekas

CHANGELOG.md

@@ -4,10 +4,11 @@ CHANGELOG
 4.4.0
 -----
 
- * added `StreamWrapper`
+ * added `HttpClient::createForBaseUri()`
  * added `HttplugClient` with support for sync and async requests
  * added `max_duration` option
  * added support for NTLM authentication
+ * added `StreamWrapper` to cast any `ResponseInterface` instances to PHP streams.
  * added `$response->toStream()` to cast responses to regular PHP streams
  * made `Psr18Client` implement relevant PSR-17 factories and have streaming responses
  * added `TraceableHttpClient`, `HttpClientDataCollector` and `HttpClientPass` to integrate with the web profiler

HttpClient.php

@@ -39,4 +39,14 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
 
         return new NativeHttpClient($defaultOptions, $maxHostConnections);
     }
+
+    /**
+     * Creates a client that adds options (e.g. authentication headers) only when the request URL matches the provided base URI.
+     */
+    public static function createForBaseUri(string $baseUri, array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface
+    {
+        $client = self::create([], $maxHostConnections, $maxPendingPushes);
+
+        return ScopingHttpClient::forBaseUri($client, $baseUri, $defaultOptions);
+    }
 }

HttplugClient.php

@@ -16,6 +16,7 @@
 use Http\Client\Exception\RequestException;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient as HttplugInterface;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Http\Message\RequestFactory;
 use Http\Message\StreamFactory;
 use Http\Message\UriFactory;
@@ -70,13 +71,13 @@ public function __construct(HttpClientInterface $client = null, ResponseFactoryI
         $this->promisePool = \function_exists('GuzzleHttp\Promise\queue') ? new \SplObjectStorage() : null;
 
         if (null === $this->responseFactory || null === $this->streamFactory) {
-            if (!class_exists(Psr17Factory::class)) {
+            if (!class_exists(Psr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
                 throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\HttplugClient" as no PSR-17 factories have been provided. Try running "composer require nyholm/psr7".');
             }
 
-            $psr17Factory = new Psr17Factory();
-            $this->responseFactory = $this->responseFactory ?? $psr17Factory;
-            $this->streamFactory = $this->streamFactory ?? $psr17Factory;
+            $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : null;
+            $this->responseFactory = $this->responseFactory ?? $psr17Factory ?? Psr17FactoryDiscovery::findResponseFactory();
+            $this->streamFactory = $this->streamFactory ?? $psr17Factory ?? Psr17FactoryDiscovery::findStreamFactory();
         }
 
         $this->waitLoop = new HttplugWaitLoop($this->client, $this->promisePool, $this->responseFactory, $this->streamFactory);
@@ -144,10 +145,12 @@ public function createRequest($method, $uri, array $headers = [], $body = null,
     {
         if ($this->responseFactory instanceof RequestFactoryInterface) {
             $request = $this->responseFactory->createRequest($method, $uri);
-        } elseif (!class_exists(Request::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
-        } else {
+        } elseif (class_exists(Request::class)) {
             $request = new Request($method, $uri);
+        } elseif (class_exists(Psr17FactoryDiscovery::class)) {
+            $request = Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $uri);
+        } else {
+            throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
         }
 
         $request = $request
@@ -199,11 +202,15 @@ public function createUri($uri): UriInterface
             return $this->responseFactory->createUri($uri);
         }
 
-        if (!class_exists(Uri::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
+        if (class_exists(Uri::class)) {
+            return new Uri($uri);
+        }
+
+        if (class_exists(Psr17FactoryDiscovery::class)) {
+            return Psr17FactoryDiscovery::findUrlFactory()->createUri($uri);
         }
 
-        return new Uri($uri);
+        throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
     }
 
     public function __destruct()

Psr18Client.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient;
 
+use Http\Discovery\Psr17FactoryDiscovery;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Request;
 use Nyholm\Psr7\Uri;
@@ -63,13 +64,13 @@ public function __construct(HttpClientInterface $client = null, ResponseFactoryI
             return;
         }
 
-        if (!class_exists(Psr17Factory::class)) {
+        if (!class_exists(Psr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
             throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\Psr18Client" as no PSR-17 factories have been provided. Try running "composer require nyholm/psr7".');
         }
 
-        $psr17Factory = new Psr17Factory();
-        $this->responseFactory = $this->responseFactory ?? $psr17Factory;
-        $this->streamFactory = $this->streamFactory ?? $psr17Factory;
+        $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : null;
+        $this->responseFactory = $this->responseFactory ?? $psr17Factory ?? Psr17FactoryDiscovery::findResponseFactory();
+        $this->streamFactory = $this->streamFactory ?? $psr17Factory ?? Psr17FactoryDiscovery::findStreamFactory();
     }
 
     /**
@@ -124,11 +125,15 @@ public function createRequest(string $method, $uri): RequestInterface
             return $this->responseFactory->createRequest($method, $uri);
         }
 
-        if (!class_exists(Request::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
+        if (class_exists(Request::class)) {
+            return new Request($method, $uri);
         }
 
-        return new Request($method, $uri);
+        if (class_exists(Psr17FactoryDiscovery::class)) {
+            return Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $uri);
+        }
+
+        throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
     }
 
     /**
@@ -170,11 +175,15 @@ public function createUri(string $uri = ''): UriInterface
             return $this->responseFactory->createUri($uri);
         }
 
-        if (!class_exists(Uri::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
+        if (class_exists(Uri::class)) {
+            return new Uri($uri);
+        }
+
+        if (class_exists(Psr17FactoryDiscovery::class)) {
+            return Psr17FactoryDiscovery::findUrlFactory()->createUri($uri);
         }
 
-        return new Uri($uri);
+        throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
     }
 }
 

Response/CurlResponse.php

@@ -286,6 +286,11 @@ private static function perform(CurlClientState $multi, array &$responses = null
      */
     private static function select(CurlClientState $multi, float $timeout): int
     {
+        if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
+            // workaround https://bugs.php.net/76480
+            $timeout = min($timeout, 0.01);
+        }
+
         return curl_multi_select($multi->handle, $timeout);
     }