Make sure MockMiddleware matches current standards

Author: WyriHaximus

composer.json

@@ -11,7 +11,6 @@
   "require": {
     "php": "^7.2",
     "api-clients/middleware": "^4.0",
-    "api-clients/psr7-http-status-exceptions": "^1.0",
     "api-clients/transport": "^3.1",
     "psr/http-message": "^1.0",
     "ringcentral/psr7": "^1.2"

composer.lock

@@ -5,11 +5,9 @@
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
-use ApiClients\Tools\Psr7\HttpStatusExceptions\InternalServerErrorException;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\CancellablePromiseInterface;
 use function React\Promise\reject;
-use function React\Promise\resolve;
 use RingCentral\Psr7\Response;
 
 final class MockMiddleware implements MiddlewareInterface

src/MockMiddleware.php

@@ -4,10 +4,11 @@
 
 use ApiClients\Middleware\Mock\MockMiddleware;
 use ApiClients\Middleware\Mock\PathMock;
-use ApiClients\Tools\Psr7\HttpStatusExceptions\InternalServerErrorException;
 use ApiClients\Tools\TestUtilities\TestCase;
 use function Clue\React\Block\await;
+use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\Factory;
+use function React\Promise\resolve;
 use RingCentral\Psr7\Request;
 use RingCentral\Psr7\Response;
 
@@ -18,13 +19,15 @@ class MockMiddlewareTest extends TestCase
 {
     public function testNoMatchingMock(): void
     {
-        self::expectException(InternalServerErrorException::class);
-        self::expectExceptionCode(500);
-
         $middleware = new MockMiddleware();
         $request = new Request('GET', 'https://example.com', [], '');
 
-        await($middleware->pre($request, 'abc'), Factory::create());
+        /** @var ResponseInterface $response */
+        $response = await($middleware->pre($request, 'abc')->otherwise(function (ResponseInterface $response) {
+            return resolve($response);
+        }), Factory::create());
+
+        self::assertSame(500, $response->getStatusCode());
     }
 
     public function testMatchingMock(): void
@@ -42,7 +45,10 @@ public function testMatchingMock(): void
         );
         $request = new Request('GET', 'https://example.com', [], '');
 
-        $modifiedRequest = await($middleware->pre($request, 'abc'), Factory::create());
+        $modifiedRequest = await($middleware->pre($request, 'abc')->otherwise(function (ResponseInterface $response) {
+            return resolve($response);
+        }), Factory::create());
+
         self::assertSame(
             [
                 'Foo' => ['Bar'],