From 45333c7083b2b8dfecdbfd8de0a1a54d9b592ccd Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 24 Mar 2018 10:32:17 +0000 Subject: [PATCH 1/2] Use the plugin client factory in the http client builder --- lib/Gitlab/HttpClient/Builder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Gitlab/HttpClient/Builder.php b/lib/Gitlab/HttpClient/Builder.php index 15be1ff12..8c6f586eb 100644 --- a/lib/Gitlab/HttpClient/Builder.php +++ b/lib/Gitlab/HttpClient/Builder.php @@ -5,6 +5,7 @@ use Http\Client\Common\HttpMethodsClient; use Http\Client\Common\Plugin; use Http\Client\Common\PluginClient; +use Http\Client\Common\PluginClientFactory; use Http\Client\HttpClient; use Http\Discovery\HttpClientDiscovery; use Http\Discovery\MessageFactoryDiscovery; @@ -81,7 +82,7 @@ public function getHttpClient() $this->httpClientModified = false; $this->pluginClient = new HttpMethodsClient( - new PluginClient($this->httpClient, $this->plugins), + (new PluginClientFactory())->createClient($this->httpClient, $this->plugins), $this->requestFactory ); } From a792eb9db7bcb3c0b2709aef387670261c01ce85 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 24 Mar 2018 10:33:46 +0000 Subject: [PATCH 2/2] Bumped minimum client common version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d2bd56e2a..f33b591fb 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require": { "php": "^5.6 || ^7.0", "ext-xml": "*", - "php-http/client-common": "^1.5", + "php-http/client-common": "^1.6", "php-http/client-implementation": "^1.0", "php-http/discovery": "^1.2", "php-http/httplug": "^1.1",