Start version 2

Author: Nyholm

.travis.yml

@@ -7,9 +7,6 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.5
-    - 5.6
-    - 7.0
     - 7.1
     - 7.2
     - 7.3

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.0 - unreleased
+
+### Changed
+
+- Client::getLastRequest returns `null` instead of `false` when on requests have been recorded yet.
+
 ## 1.2.0 - unreleased
 
 ### Added

composer.json

@@ -11,9 +11,9 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0",
-        "php-http/httplug": "^1.0 || ^2.0",
-        "php-http/client-common": "^1.9 || ^2.0",
+        "php": "^7.1",
+        "php-http/httplug": "^2.0",
+        "php-http/client-common": "^2.0",
         "php-http/discovery": "^1.0",
         "php-http/message-factory": "^1.0"
     },
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.0-dev"
         }
     },
     "prefer-stable": true,

spec/ClientSpec.php

@@ -80,8 +80,8 @@ function it_returns_the_last_request(RequestInterface $request, ResponseInterfac
         $this->getLastRequest()->shouldReturn($request);
     }
 
-    function it_returns_false_when_there_is_no_last_request()
+    function it_returns_null_when_there_is_no_last_request()
     {
-        $this->getLastRequest()->shouldReturn(false);
+        $this->getLastRequest()->shouldReturn(null);
     }
 }

src/Client.php

@@ -3,7 +3,6 @@
 namespace Http\Mock;
 
 use Http\Client\Common\HttpAsyncClientEmulator;
-use Http\Client\Common\VersionBridgeClient;
 use Http\Client\Exception;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
@@ -23,7 +22,6 @@
 class Client implements HttpClient, HttpAsyncClient
 {
     use HttpAsyncClientEmulator;
-    use VersionBridgeClient;
 
     /**
      * @var ResponseFactory
@@ -61,9 +59,15 @@ public function __construct(ResponseFactory $responseFactory = null)
     }
 
     /**
-     * {@inheritdoc}
+     * This will in order:
+     *
+     * - Throw the next exception in the list and advance
+     * - Return the next response in the list and advance
+     * - Throw the default exception if set (forever)
+     * - Return the default response if set (forever)
+     * - Create a new empty response with the response factory
      */
-    public function doSendRequest(RequestInterface $request)
+    public function sendRequest(RequestInterface $request): ResponseInterface
     {
         $this->requests[] = $request;
 
@@ -100,7 +104,7 @@ public function addException(\Exception $exception)
      *
      * If both a default exception and a default response are set, the exception will be thrown.
      */
-    public function setDefaultException(\Exception $defaultException = null)
+    public function setDefaultException(?\Exception $defaultException)
     {
         $this->defaultException = $defaultException;
     }
@@ -116,7 +120,7 @@ public function addResponse(ResponseInterface $response)
     /**
      * Sets the default response to be returned when the list of added exceptions and responses is exhausted.
      */
-    public function setDefaultResponse(ResponseInterface $defaultResponse = null)
+    public function setDefaultResponse(?ResponseInterface $defaultResponse)
     {
         $this->defaultResponse = $defaultResponse;
     }
@@ -126,13 +130,13 @@ public function setDefaultResponse(ResponseInterface $defaultResponse = null)
      *
      * @return RequestInterface[]
      */
-    public function getRequests()
+    public function getRequests(): array
     {
         return $this->requests;
     }
 
-    public function getLastRequest()
+    public function getLastRequest(): ?RequestInterface
     {
-        return end($this->requests);
+        return end($this->requests) ?: null;
     }
 }