Switched to PSR-17

Author: GrahamCampbell

README.md

@@ -12,44 +12,39 @@ Based on [php-github-api](https://github.com/m4tthumphrey/php-github-api) and co
 Installation
 ------------
 
-Via [Composer](https://getcomposer.org).
+Via [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
 
-### PHP 7.2+:
+### PHP 7.1+:
 
 ```bash
-composer require m4tthumphrey/php-gitlab-api guzzlehttp/guzzle:^7.0.1
+composer require m4tthumphrey/php-gitlab-api:^10.0 php-http/guzzle6-adapter:^2.0.1 http-interop/http-factory-guzzle:^1.0
 ```
 
-### PHP 7.1+:
+### PHP 7.2+:
 
 ```bash
-composer require m4tthumphrey/php-gitlab-api php-http/guzzle6-adapter:^2.0.1
+composer require m4tthumphrey/php-gitlab-api:^10.0 guzzlehttp/guzzle:^7.0.1 http-interop/http-factory-guzzle:^1.0
 ```
 
-### Laravel 5.5+:
+### Laravel 6+:
 
 ```bash
-composer require graham-campbell/gitlab guzzlehttp/guzzle:^7.0.1
+composer require graham-campbell/gitlab:^4.0 guzzlehttp/guzzle:^7.0.1 http-interop/http-factory-guzzle:^1.0
 ```
 
-### Symfony 3.4+:
+### Symfony 4.4:
 
 ```bash
-composer require zeichen32/gitlabapibundle guzzlehttp/guzzle:^7.0.1
+composer require zeichen32/gitlabapibundle:^5.0 symfony/http-client:^4.4 nyholm/psr7:^1.3
 ```
 
-We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. [graham-campbell/gitlab](https://github.com/GrahamCampbell/Laravel-GitLab) is by [Graham Campbell](https://github.com/GrahamCampbell) and [zeichen32/gitlabapibundle](https://github.com/Zeichen32/GitLabApiBundle) is by [Jens Averkamp](https://github.com/Zeichen32).
-
-Versioning
-----------
+### Symfony 5:
 
-Depending on your Gitlab server version, you must choose the right version of this library.
-Please refer to the following table to pick the right one.
+```bash
+composer require zeichen32/gitlabapibundle:^5.0 symfony/http-client:^5.0 nyholm/psr7:^1.3
+```
 
-|Version|Gitlab API Version|Gitlab Version|
-|-------|------------------|--------------|
-|9.x    | V4               | >= 9.0       |
-|8.x    | V3               | < 9.5        |
+We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. [graham-campbell/gitlab](https://github.com/GrahamCampbell/Laravel-GitLab) is by [Graham Campbell](https://github.com/GrahamCampbell) and [zeichen32/gitlabapibundle](https://github.com/Zeichen32/GitLabApiBundle) is by [Jens Averkamp](https://github.com/Zeichen32).
 
 General API Usage
 -----------------
@@ -85,8 +80,6 @@ $issues = $pager->fetchAll($client->api('issues'),'all',[null, ['state' => 'clos
 
 ```
 
-
-
 Model Usage
 -----------
 

composer.json

@@ -23,19 +23,24 @@
     "require": {
         "php": "^7.1",
         "ext-xml": "*",
-        "php-http/client-common": "^2.1",
+        "php-http/client-common": "^2.2",
         "php-http/cache-plugin": "^1.7",
-        "php-http/discovery": "^1.7",
+        "php-http/discovery": "^1.9",
         "php-http/httplug": "^2.1",
         "php-http/multipart-stream-builder": "^1.1",
+        "psr/http-client-implementation": "^1.0",
+        "psr/http-factory-implementation": "^1.0",
+        "psr/http-message": "^1.0",
         "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^1.2",
-        "php-http/guzzle6-adapter": "^2.0",
-        "php-http/mock-client": "^1.2",
+        "guzzlehttp/psr7": "^1.5.2",
+        "php-http/guzzle6-adapter": "^2.0.1",
+        "http-interop/http-factory-guzzle": "^1.0",
         "phpunit/phpunit": "^7.5.15",
-        "phpstan/phpstan": "^0.12.23"
+        "phpstan/phpstan": "^0.12.32",
+        "phpstan/extension-installer": "^1.0.4",
+        "phpstan/phpstan-deprecation-rules": "^0.12.4"
     },
     "autoload": {
         "psr-4": { "Gitlab\\": "lib/Gitlab/" }
@@ -45,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "9.17-dev"
+            "dev-master": "10.0-dev"
         }
     }
 }

lib/Gitlab/Api/AbstractApi.php

@@ -4,10 +4,10 @@
 use Gitlab\HttpClient\Message\QueryStringBuilder;
 use Gitlab\HttpClient\Message\ResponseMediator;
 use Gitlab\Tests\HttpClient\Message\QueryStringBuilderTest;
-use Http\Discovery\StreamFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
-use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\StreamInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,18 +28,18 @@ abstract class AbstractApi implements ApiInterface
     protected $client;
 
     /**
-     * @var StreamFactory
+     * @var StreamFactoryInterface
      */
     private $streamFactory;
 
     /**
      * @param Client $client
-     * @param StreamFactory|null $streamFactory
+     * @param StreamFactoryInterface|null $streamFactory
      */
-    public function __construct(Client $client, StreamFactory $streamFactory = null)
+    public function __construct(Client $client, StreamFactoryInterface $streamFactory = null)
     {
         $this->client = $client;
-        $this->streamFactory = $streamFactory ?: StreamFactoryDiscovery::find();
+        $this->streamFactory = $streamFactory ?: Psr17FactoryDiscovery::findStreamFactory();
     }
 
     /**

lib/Gitlab/Client.php

@@ -12,7 +12,7 @@
 use Http\Client\Common\Plugin\HeaderDefaultsPlugin;
 use Http\Client\Common\Plugin\HistoryPlugin;
 use Http\Client\Common\Plugin\RedirectPlugin;
-use Http\Discovery\UriFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Psr\Http\Client\ClientInterface;
 
 /**
@@ -441,7 +441,7 @@ public function authenticate($token, $authMethod = self::AUTH_URL_TOKEN, $sudo =
     public function setUrl($url)
     {
         $this->httpClientBuilder->removePlugin(AddHostPlugin::class);
-        $this->httpClientBuilder->addPlugin(new AddHostPlugin(UriFactoryDiscovery::find()->createUri($url)));
+        $this->httpClientBuilder->addPlugin(new AddHostPlugin(Psr17FactoryDiscovery::findUrlFactory()->createUri($url)));
 
         return $this;
     }

lib/Gitlab/HttpClient/Builder.php

@@ -6,12 +6,11 @@
 use Http\Client\Common\Plugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\Common\PluginClientFactory;
-use Http\Discovery\MessageFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Http\Discovery\Psr18ClientDiscovery;
-use Http\Discovery\StreamFactoryDiscovery;
-use Http\Message\RequestFactory;
-use Http\Message\StreamFactory;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 
 /**
  * A builder that builds the API client.
@@ -36,12 +35,12 @@ class Builder
     private $pluginClient;
 
     /**
-     * @var RequestFactory
+     * @var RequestFactoryInterface
      */
     private $requestFactory;
 
     /**
-     * @var StreamFactory
+     * @var StreamFactoryInterface
      */
     private $streamFactory;
 
@@ -58,18 +57,18 @@ class Builder
     private $plugins = [];
 
     /**
-     * @param ClientInterface $httpClient
-     * @param RequestFactory  $requestFactory
-     * @param StreamFactory   $streamFactory
+     * @param ClientInterface|null         $httpClient
+     * @param RequestFactoryInterface|null $requestFactory
+     * @param StreamFactoryInterface|null  $streamFactory
      */
     public function __construct(
         ClientInterface $httpClient = null,
-        RequestFactory $requestFactory = null,
-        StreamFactory $streamFactory = null
+        RequestFactoryInterface $requestFactory = null,
+        StreamFactoryInterface $streamFactory = null
     ) {
         $this->httpClient = $httpClient ?: Psr18ClientDiscovery::find();
-        $this->requestFactory = $requestFactory ?: MessageFactoryDiscovery::find();
-        $this->streamFactory = $streamFactory ?: StreamFactoryDiscovery::find();
+        $this->requestFactory = $requestFactory ?: Psr17FactoryDiscovery::findRequestFactory();
+        $this->streamFactory = $streamFactory ?: Psr17FactoryDiscovery::findStreamFactory();
     }
 
     /**

test/Gitlab/Tests/HttpClient/BuilderTest.php

@@ -5,10 +5,10 @@
 use Gitlab\HttpClient\Builder;
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin;
-use Http\Message\RequestFactory;
-use Http\Message\StreamFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 
 /**
  * @author Fabien Bourigault <[email protected]>
@@ -24,8 +24,8 @@ public function setUp()
     {
         $this->subject = new Builder(
             $this->getMockBuilder(ClientInterface::class)->getMock(),
-            $this->getMockBuilder(RequestFactory::class)->getMock(),
-            $this->getMockBuilder(StreamFactory::class)->getMock()
+            $this->getMockBuilder(RequestFactoryInterface::class)->getMock(),
+            $this->getMockBuilder(StreamFactoryInterface::class)->getMock()
         );
     }