Get the stream and uri factories from the http builder

Author: GrahamCampbell

lib/Gitlab/Api/AbstractApi.php

@@ -6,7 +6,6 @@
 use Gitlab\Exception\RuntimeException;
 use Gitlab\HttpClient\Message\ResponseMediator;
 use Gitlab\HttpClient\Util\QueryStringBuilder;
-use Http\Discovery\StreamFactoryDiscovery;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
@@ -38,14 +37,20 @@ abstract class AbstractApi implements ApiInterface
 
     /**
      * @param Client             $client
-     * @param StreamFactory|null $streamFactory
+     * @param StreamFactory|null $streamFactory @deprecated since version 9.18 and will be removed in 10.0.
      *
      * @return void
      */
     public function __construct(Client $client, StreamFactory $streamFactory = null)
     {
         $this->client = $client;
-        $this->streamFactory = null === $streamFactory ? StreamFactoryDiscovery::find() : $streamFactory;
+
+        if (null === $streamFactory) {
+            $this->streamFactory = $client->getStreamFactory();
+        } else {
+            @trigger_error(sprintf('The %s() method\'s $streamFactory parameter is deprecated since version 9.18 and will be removed in 10.0.', __METHOD__), E_USER_DEPRECATED);
+            $this->streamFactory = $streamFactory;
+        }
     }
 
     /**

lib/Gitlab/Client.php

@@ -14,8 +14,8 @@
 use Http\Client\Common\Plugin\HeaderDefaultsPlugin;
 use Http\Client\Common\Plugin\HistoryPlugin;
 use Http\Client\Common\Plugin\RedirectPlugin;
+use Http\Message\StreamFactory;
 use Http\Client\HttpClient;
-use Http\Discovery\UriFactoryDiscovery;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -483,8 +483,10 @@ public function authenticate($token, $authMethod = null, $sudo = null)
      */
     public function setUrl($url)
     {
+        $uri = $this->getHttpClientBuilder()->getUriFactory()->createUri($url);
+
         $this->getHttpClientBuilder()->removePlugin(AddHostPlugin::class);
-        $this->getHttpClientBuilder()->addPlugin(new AddHostPlugin(UriFactoryDiscovery::find()->createUri($url)));
+        $this->getHttpClientBuilder()->addPlugin(new AddHostPlugin($uri));
 
         return $this;
     }
@@ -535,6 +537,16 @@ public function getHttpClient()
         return $this->getHttpClientBuilder()->getHttpClient();
     }
 
+    /**
+     * Get the stream factory.
+     *
+     * @return StreamFactory
+     */
+    public function getStreamFactory()
+    {
+        return $this->getHttpClientBuilder()->getStreamFactory();
+    }
+
     /**
      * Get the HTTP client builder.
      *

lib/Gitlab/HttpClient/Builder.php

@@ -11,8 +11,10 @@
 use Http\Discovery\HttpClientDiscovery;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Discovery\StreamFactoryDiscovery;
+use Http\Discovery\UriFactoryDiscovery;
 use Http\Message\RequestFactory;
 use Http\Message\StreamFactory;
+use Http\Message\UriFactory;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
@@ -46,6 +48,13 @@ class Builder
      */
     private $streamFactory;
 
+    /**
+     * The URI factory.
+     *
+     * @var UriFactory
+     */
+    private $uriFactory;
+
     /**
      * The currently registered plugins.
      *
@@ -75,17 +84,20 @@ class Builder
      * @param HttpClient|null     $httpClient
      * @param RequestFactory|null $requestFactory
      * @param StreamFactory|null  $streamFactory
+     * @param UriFactory|null     $uriFactory
      *
      * @return void
      */
     public function __construct(
         HttpClient $httpClient = null,
         RequestFactory $requestFactory = null,
-        StreamFactory $streamFactory = null
+        StreamFactory $streamFactory = null,
+        UriFactory $uriFactory = null
     ) {
         $this->httpClient = null === $httpClient ? HttpClientDiscovery::find() : $httpClient;
         $this->requestFactory = null === $requestFactory ? MessageFactoryDiscovery::find() : $requestFactory;
         $this->streamFactory = null === $streamFactory ? StreamFactoryDiscovery::find() : $streamFactory;
+        $this->uriFactory = null === $uriFactory ? UriFactoryDiscovery::find() : $uriFactory;
     }
 
     /**
@@ -108,6 +120,36 @@ public function getHttpClient()
         return $this->pluginClient;
     }
 
+    /**
+     * Get the request factory.
+     *
+     * @return RequestFactory
+     */
+    public function getRequestFactory()
+    {
+        return $this->requestFactory;
+    }
+
+    /**
+     * Get the stream factory.
+     *
+     * @return StreamFactory
+     */
+    public function getStreamFactory()
+    {
+        return $this->streamFactory;
+    }
+
+    /**
+     * Get the URI factory.
+     *
+     * @return UriFactory
+     */
+    public function getUriFactory()
+    {
+        return $this->uriFactory;
+    }
+
     /**
      * Add a new plugin to the end of the plugin chain.
      *

phpstan-baseline.neon

@@ -1,27 +1,22 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\StreamFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
-			count: 1
-			path: lib/Gitlab/Api/AbstractApi.php
-
 		-
 			message: "#^Fetching deprecated class constant AUTH_URL_TOKEN of class Gitlab\\\\Client\\:\nsince version 9\\.18 and will be removed in 10\\.0\\.$#"
 			count: 2
 			path: lib/Gitlab/Client.php
 
 		-
-			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\UriFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
+			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\MessageFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
 			count: 1
-			path: lib/Gitlab/Client.php
+			path: lib/Gitlab/HttpClient/Builder.php
 
 		-
-			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\MessageFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
+			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\StreamFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
 			count: 1
 			path: lib/Gitlab/HttpClient/Builder.php
 
 		-
-			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\StreamFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
+			message: "#^Call to method find\\(\\) of deprecated class Http\\\\Discovery\\\\UriFactoryDiscovery\\:\nThis will be removed in 2\\.0\\. Consider using Psr17FactoryDiscovery\\.$#"
 			count: 1
 			path: lib/Gitlab/HttpClient/Builder.php