Update to use PSR-17 and PSR-18

Author: danmichaelo

README.md

@@ -16,23 +16,18 @@ the [php-sru-search](https://github.com/Zeitschriftendatenbank/php-sru-search) p
 
 ## Install using Composer
 
-Make sure you have [Composer](https://getcomposer.org) installed, then run
+Use [Composer](https://getcomposer.org) to install sru-client with a compatible HTTP library such as Guzzle:
 
 ```bash
-composer require scriptotek/sru-client
+composer require scriptotek/sru-client php-http/guzzle6-adapter http-interop/http-factory-guzzle
 ```
 
-in your project directory to get the latest stable version of the package.
+We use [HTTP discovery](https://github.com/http-interop/http-factory-discovery) to discover
+[HTTP client](https://packagist.org/providers/psr/http-client-implementation) and
+[HTTP factory](https://packagist.org/providers/psr/http-factory-implementation) implementations,
+so Guzzle can be swapped with any other
+[PSR-17](https://www.php-fig.org/psr/psr-17/)/[PSR-18](https://www.php-fig.org/psr/psr-18/)-compatible library.
 
-**You also need a HTTP library**. If you're not already using one in your project,
-just add Guzzle:
-
-```bash
-composer require php-http/guzzle6-adapter
-```
-
-[HTTPlug discovery](http://php-http.readthedocs.io/en/latest/discovery.html) is
-used in order to not depend on a specific library.
 
 ## Configuring the client
 

composer.json

@@ -7,19 +7,17 @@
     "require": {
         "php" : "^7.1",
         "danmichaelo/quitesimplexmlelement": "^1.0",
-        "php-http/client-implementation": "^1.0",
-        "php-http/httplug": "^1.1",
-        "php-http/message-factory": "^1.0",
-        "php-http/discovery": "^1.0",
-        "php-http/client-common": "^1.5"
+        "psr/http-client-implementation": "^1.0",
+        "psr/http-factory-implementation": "^1.0",
+        "http-interop/http-factory-discovery": "^1.4",
+        "php-http/client-common": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0 || ^8.0",
         "sami/sami": "^3.3",
         "php-http/mock-client": "^1.0",
-        "php-http/message": "^1.0",
-        "guzzlehttp/psr7": "^1.0",
-        "php-http/guzzle6-adapter": "^1.1"
+        "http-interop/http-factory-guzzle": "^1.0",
+        "php-http/guzzle6-adapter": "^2.0"
     },
     "license": "MIT",
     "authors": [

src/Client.php

@@ -2,24 +2,25 @@
 
 use Http\Client\Common\Plugin\AuthenticationPlugin;
 use Http\Client\Common\PluginClient;
-use Http\Client\HttpClient;
-use Http\Discovery\HttpClientDiscovery;
 use Http\Client\Common\Exception\ServerErrorException;
-use Http\Client\Common\Plugin\ErrorPlugin;
-use Http\Discovery\MessageFactoryDiscovery;
+use Http\Factory\Discovery\HttpClient;
+use Http\Factory\Discovery\HttpFactory;
 use Http\Message\Authentication\BasicAuth;
-use Http\Message\MessageFactory;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 
 /**
  * SRU client
  */
 class Client
 {
-    /** @var HttpClient */
+    /** @var ClientInterface */
     protected $httpClient;
 
-    /** @var MessageFactory */
-    protected $messageFactory;
+    /**
+     * @var RequestFactoryInterface
+     */
+    private $requestFactory;
 
     /** @var string SRU service base URL */
     protected $url;
@@ -52,17 +53,17 @@ class Client
     /**
      * Create a new client
      *
-     * @param string              $url     Base URL to the SRU service
-     * @param array               $options Associative array of options
-     * @param HttpClient          $httpClient
-     * @param MessageFactory|null $messageFactory
+     * @param string                  $url             Base URL to the SRU service
+     * @param array                   $options         Associative array of options
+     * @param ClientInterface         $httpClient
+     * @param RequestFactoryInterface $requestFactory
      * @throws \ErrorException
      */
     public function __construct(
         $url,
         $options = null,
-        HttpClient $httpClient = null,
-        MessageFactory $messageFactory = null
+        ClientInterface $httpClient = null,
+        RequestFactoryInterface $requestFactory = null
     ) {
         $this->url = $url;
         $options = $options ?: array();
@@ -95,8 +96,8 @@ public function __construct(
             throw new\ErrorException('Not supported');
         }
 
-        $this->httpClient = new PluginClient($httpClient ?: HttpClientDiscovery::find(), $plugins);
-        $this->messageFactory = $messageFactory ?: MessageFactoryDiscovery::find();
+        $this->httpClient = new PluginClient($httpClient ?: HttpClient::client(), $plugins);
+        $this->requestFactory = $requestFactory ?: HttpFactory::requestFactory();
     }
 
     /**
@@ -212,7 +213,7 @@ public function explain()
      */
     public function request($method, $url)
     {
-        $request = $this->messageFactory->createRequest($method, $url, $this->headers);
+        $request = $this->requestFactory->createRequest($method, $url, $this->headers);
         $response = $this->httpClient->sendRequest($request);
 
         if ($response->getStatusCode() >= 500 && $response->getStatusCode() < 600) {