Merge branch 'hotfix/125'

weierophinney · weierophinney · commit 422d426a3384 · 2015-09-10T13:49:55.000-05:00
Close #125
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#125](https://github.com/zendframework/zend-expressive/pull/125) fixes the
+  `WhoopsErrorHandler` to ensure it pushes the "pretty page handler" into the
+  Whoops runtime.
 
 ## 0.2.0 - 2015-09-03
 
diff --git a/src/WhoopsErrorHandler.php b/src/WhoopsErrorHandler.php
@@ -77,6 +77,8 @@ protected function handleException(\Exception $exception, Request $request, Resp
     {
         $this->prepareWhoopsHandler($request);
 
+        $this->whoops->pushHandler($this->whoopsHandler);
+
         $response
             ->getBody()
             ->write($this->whoops->handleException($exception));

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ protected function handleException(\Exception $exception, Request $request, Resp`
`77`	`77`	`{`
`78`	`78`	`$this->prepareWhoopsHandler($request);`
`79`	`79`
	`80`	`+ $this->whoops->pushHandler($this->whoopsHandler);`
	`81`	`+`
`80`	`82`	`$response`
`81`	`83`	`->getBody()`
`82`	`84`	`->write($this->whoops->handleException($exception));`