Merge branch 'hotfix/151' into release-2.7

Close #151

Author: weierophinney

src/MiddlewareListener.php

@@ -60,18 +60,18 @@ public function onDispatch(MvcEvent $event)
         $caughtException = null;
         try {
             $return = $middleware(Psr7Request::fromZend($request), Psr7Response::fromZend($response));
-        } catch (\Throwable $exception) {
-            $caughtException = $exception;
-        } catch (\Exception $exception) {  // @TODO clean up once PHP 7 requirement is enforced
-            $caughtException = $exception;
+        } catch (\Throwable $ex) {
+            $caughtException = $ex;
+        } catch (\Exception $ex) {  // @TODO clean up once PHP 7 requirement is enforced
+            $caughtException = $ex;
         }
 
         if ($caughtException !== null) {
             $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
             $event->setError($application::ERROR_EXCEPTION);
             $event->setController($middlewareName);
             $event->setControllerClass(get_class($middleware));
-            $event->setParam('exception', $exception);
+            $event->setParam('exception', $caughtException);
 
             $events  = $application->getEventManager();
             $results = $events->triggerEvent($event);

src/View/Http/DefaultRenderingStrategy.php

@@ -111,14 +111,14 @@ public function render(MvcEvent $e)
 
         if ($caughtException !== null) {
             if ($e->getName() === MvcEvent::EVENT_RENDER_ERROR) {
-                throw $ex;
+                throw $caughtException;
             }
 
             $application = $e->getApplication();
             $events      = $application->getEventManager();
 
             $e->setError(Application::ERROR_EXCEPTION);
-            $e->setParam('exception', $ex);
+            $e->setParam('exception', $caughtException);
             $e->setName(MvcEvent::EVENT_RENDER_ERROR);
             $events->triggerEvent($e);
         }