Adjusting the Mock class for compatibility with guzzlehttp version 6

src/Mock.php

@@ -8,32 +8,29 @@
 use Aeris\GuzzleHttpMock\Exception\UnexpectedHttpRequestException;
 use Aeris\GuzzleHttpMock\Expectation\RequestExpectation;
 use Aeris\GuzzleHttpMock\Exception\Exception as HttpMockException;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Message\ResponseInterface;
+use GuzzleHttp\HandlerStack;
+use Psr\Http\Message\RequestInterface;
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Sets expectations against requests made with the Guzzle Http Client,
  * and mocks responses.
  */
-class Mock implements SubscriberInterface {
+class Mock {
 
 	/** @var \Aeris\GuzzleHttpMock\Expectation\RequestExpectation[] */
 	protected $requestExpectations = [];
 
 	/** @var UnexpectedHttpRequestException[] */
 	protected $exceptions = [];
 
-	public function attachToClient(ClientInterface &$client) {
-		$client->getEmitter()->attach($this);
-	}
+	public static function createWithMiddleware() {
+	    return HandlerStack::create(new self());
+    }
 
 	public function shouldReceiveRequest(RequestInterface &$request = null) {
-		$expectation = new Expectation\RequestExpectation($request);
+		$expectation = new RequestExpectation($request);
 		$this->requestExpectations[] = $expectation;
 
 		return $expectation;
@@ -56,42 +53,43 @@ public function verify() {
 		}
 	}
 
-	public function getEvents() {
-		return [
-			// Provide name and optional priority
-			'before' => ['onBefore', 'last'],
-		];
-	}
-
-	public function onBefore(BeforeEvent $event) {
-		$request = $event->getRequest();
-
-		try {
-			$response = $this->makeRequest($request);
-			$event->intercept($response);
-		}
-		catch (HttpMockException $error) {
-			$this->fail($error, $event);
-		}
-	}
+	public function __invoke(RequestInterface $request, array $options)
+    {
+        try {
+            $response = $this->makeRequest($request,$options);
+        }
+        catch (HttpMockException $error) {
+            $this->fail($error);
+
+            // Set a stub response.
+            // The exception will actually be thrown in
+            // `verify()`
+            // If we threw the exception here,
+            // it would be caught by Guzzle,
+            // and wrapped into a RequestException
+            return \GuzzleHttp\Promise\promise_for(new Response(200));
+        }
+
+        return \GuzzleHttp\Promise\promise_for($response);
+    }
 
 	/**
 	 * @param RequestInterface $request
 	 * @return ResponseInterface
 	 * @throws CompoundUnexpectedHttpRequestException
 	 */
-	private function makeRequest(RequestInterface $request) {
+	private function makeRequest(RequestInterface $request, array $options) {
 		$state = array_reduce(
 			$this->requestExpectations,
-			function (array $state, Expectation\RequestExpectation $requestExpectation) use ($request) {
+			function (array $state, Expectation\RequestExpectation $requestExpectation) use ($request, $options) {
 				// We got a successful response -- we're good to go.
 				if (isset($state['response'])) {
 					return $state;
 				}
 
 				// Try to make a request against the expectation
 				try {
-					$state['response'] = $requestExpectation->makeRequest($request);
+					$state['response'] = $requestExpectation->makeRequest($request, $options);
 				}
 				catch (UnexpectedHttpRequestException $error) {
 					// Save the error
@@ -109,23 +107,15 @@ function (array $state, Expectation\RequestExpectation $requestExpectation) use
 		if (is_null($state['response'])) {
 			$msg = array_reduce($state['errors'], function($msg, \Exception $err) {
 				return $msg . PHP_EOL . $err->getMessage();
-			}, "No mock matches request `{$request->getMethod()} {$request->getUrl()}`:");
+			}, "No mock matches request `{$request->getMethod()} {".(string)$request->getUri()."}`:");
 
 			throw new UnexpectedHttpRequestException($msg);
 		}
 
 		return $state['response'];
 	}
 
-	protected function fail(\Exception $error, BeforeEvent $event) {
+	protected function fail(\Exception $error) {
 		$this->exceptions[] = $error;
-
-		// Set a stub response.
-		// The exception will actually be thrown in
-		// `verify()`
-		// If we threw the exception here,
-		// it would be caught by Guzzle,
-		// and wrapped into a RequestException
-		$event->intercept(new Response(200));
 	}
 }