Merge branch 'hotfix/479'

Close #479

Author: geerteltink

CHANGELOG.md

@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#479](https://github.com/zendframework/zend-expressive/pull/479) fixes the
+  `WhoopsErrorResponseGenerator::$whoops` dockblock Type to support Whoops 1
+  and 2.
 
 ## 2.0.3 - 2017-03-28
 
@@ -186,7 +188,7 @@ All notable changes to this project will be documented in this file, in reverse
   `Zend\Expressive\Delegate\NotFoundDelegate`.
 
 - [#428](https://github.com/zendframework/zend-expressive/pull/428) adds the
-  constants `DISPATCH_MIDDLEWARE` and `ROUTING_MIDDLEWARE` to 
+  constants `DISPATCH_MIDDLEWARE` and `ROUTING_MIDDLEWARE` to
   `Zend\Expressive\Application`; they have identical values to the constants
   previously defined in `Zend\Expressive\Container\ApplicationFactory`.
 

src/Middleware/WhoopsErrorResponseGenerator.php

@@ -19,7 +19,7 @@
 class WhoopsErrorResponseGenerator
 {
     /**
-     * @var Run
+     * @var Run|RunInterface
      */
     private $whoops;