Merge branch 'hotfix/623'

Close #623

Author: weierophinney

test/ExceptionTest.php

@@ -12,6 +12,7 @@
 use Generator;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerExceptionInterface;
+use Zend\Expressive\Exception\ContainerNotRegisteredException;
 use Zend\Expressive\Exception\ExceptionInterface;
 use Zend\Expressive\Exception\InvalidMiddlewareException;
 use Zend\Expressive\Exception\MissingDependencyException;
@@ -58,4 +59,14 @@ public function testExceptionIsInstanceOfContainerExceptionInterface(string $exc
     {
         $this->assertTrue(is_a($exception, ContainerExceptionInterface::class, true));
     }
+
+    public function testContainerNotRegisteredExceptionForMiddlewareService()
+    {
+        $exception = ContainerNotRegisteredException::forMiddlewareService('foo');
+
+        $this->assertSame(
+            'Cannot marshal middleware by service name "foo"; no container registered',
+            $exception->getMessage()
+        );
+    }
 }

test/Middleware/WhoopsErrorResponseGeneratorTest.php

@@ -10,12 +10,14 @@
 namespace ZendTest\Expressive\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface as StatusCode;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
+use stdClass;
 use Whoops\Handler\JsonResponseHandler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;
@@ -160,4 +162,30 @@ public function testJsonContentTypeResponseWithJsonResponseHandler()
             $generator($error, $this->request->reveal(), $this->response->reveal())
         );
     }
+
+    public function testThrowsInvalidArgumentExceptionOnNonRunForObject()
+    {
+        $whoops = new stdClass();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'Zend\Expressive\Middleware\WhoopsErrorResponseGenerator expects a Whoops\Run'
+            . ' or Whoops\RunInterface instance; received stdClass'
+        );
+
+        new WhoopsErrorResponseGenerator($whoops);
+    }
+
+    public function testThrowsInvalidArgumentExceptionOnNonRunForScalar()
+    {
+        $whoops = 'foo';
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'Zend\Expressive\Middleware\WhoopsErrorResponseGenerator expects a Whoops\Run'
+            . ' or Whoops\RunInterface instance; received string'
+        );
+
+        new WhoopsErrorResponseGenerator($whoops);
+    }
 }