Merge pull request #6 from swisnl/feature/httplug-2.0

Add support for HTTPlug 2.0 and PSR-18

Author: JaZo

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to `swisnl/php-http-fixture-client` will be documented in th
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## Unreleased
+
+### Added
+- Add support for HTTPlug 2.0 and [PSR-18](https://www.php-fig.org/psr/psr-18/)
+
 ## [2.1.0] - 2018-10-05
 
 ### Added

composer.json

@@ -8,7 +8,8 @@
         "php-http",
         "fixture",
         "client",
-        "psr-7"
+        "psr-7",
+        "psr-18"
     ],
     "homepage": "https://github.com/swisnl/php-http-fixture-client",
     "license": "MIT",
@@ -24,7 +25,7 @@
         "php": "^7.0",
         "danielstjules/stringy": "^3.1",
         "php-http/discovery": "^1.4",
-        "php-http/mock-client": "^1.1",
+        "php-http/mock-client": "^1.2",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
@@ -34,7 +35,8 @@
     },
     "provide": {
         "php-http/async-client-implementation": "1.0",
-        "php-http/client-implementation": "1.0"
+        "php-http/client-implementation": "1.0",
+        "psr/http-client-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {

src/Client.php

@@ -25,17 +25,12 @@ public function __construct(ResponseBuilderInterface $fixtureResponseBuilder, Re
     }
 
     /**
-     * @param \Psr\Http\Message\RequestInterface $request
-     *
-     * @throws \Http\Client\Exception
-     * @throws \Exception
-     *
-     * @return \Psr\Http\Message\ResponseInterface|mixed|null
+     * {@inheritdoc}
      */
-    public function sendRequest(RequestInterface $request)
+    public function doSendRequest(RequestInterface $request)
     {
         $this->setDefaultResponse($this->fixtureResponseBuilder->build($request));
 
-        return parent::sendRequest($request);
+        return parent::doSendRequest($request);
     }
 }