Added PHP 7 cleanup todos

zendframework · May 3, 2016 · 0cd4135 · 0cd4135
1 parent 1077480
commit 0cd4135
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/DispatchListener.php b/src/DispatchListener.php
@@ -101,7 +101,7 @@ public function onDispatch(MvcEvent $e)
         } catch (\Throwable $exception) {
             $return = $this->marshalBadControllerEvent($controllerName, $e, $application, $exception);
             return $this->complete($return, $e);
-        } catch (\Exception $exception) {
+        } catch (\Exception $exception) {  // @TODO clean up once PHP 7 requirement is enforced
             $return = $this->marshalBadControllerEvent($controllerName, $e, $application, $exception);
             return $this->complete($return, $e);
         }
@@ -118,7 +118,7 @@ public function onDispatch(MvcEvent $e)
             $return = $controller->dispatch($request, $response);
         } catch (\Throwable $ex) {
             $caughtException = $ex;
-        } catch (\Exception $ex) {
+        } catch (\Exception $ex) {  // @TODO clean up once PHP 7 requirement is enforced
             $caughtException = $ex;
         }
 
@@ -145,7 +145,7 @@ public function reportMonitorEvent(MvcEvent $e)
     {
         $error     = $e->getError();
         $exception = $e->getParam('exception');
-        if ($exception instanceof \Exception || $exception instanceof \Throwable) {
+        if ($exception instanceof \Exception || $exception instanceof \Throwable) {  // @TODO clean up once PHP 7 requirement is enforced
             zend_monitor_custom_event_ex($error, $exception->getMessage(), 'Zend Framework Exception', ['code' => $exception->getCode(), 'trace' => $exception->getTraceAsString()]);
         }
     }

diff --git a/src/MiddlewareListener.php b/src/MiddlewareListener.php
@@ -62,7 +62,7 @@ public function onDispatch(MvcEvent $event)
             $return = $middleware(Psr7Request::fromZend($request), Psr7Response::fromZend($response));
         } catch (\Throwable $exception) {
             $caughtException = $exception;
-        } catch (\Exception $exception) {
+        } catch (\Exception $exception) {  // @TODO clean up once PHP 7 requirement is enforced
             $caughtException = $exception;
         }
 

diff --git a/src/View/Console/ExceptionStrategy.php b/src/View/Console/ExceptionStrategy.php
@@ -184,7 +184,7 @@ public function prepareExceptionViewModel(MvcEvent $e)
                 if (is_callable($this->message)) {
                     $callback = $this->message;
                     $message = (string) $callback($exception, $this->displayExceptions);
-                } elseif ($this->displayExceptions && ($exception instanceof \Exception || $exception instanceof \Throwable)) {
+                } elseif ($this->displayExceptions && ($exception instanceof \Exception || $exception instanceof \Throwable)) {  // @TODO clean up once PHP 7 requirement is enforced
                     $previous = '';
                     $previousException = $exception->getPrevious();
                     while ($previousException) {

diff --git a/src/View/Console/RouteNotFoundStrategy.php b/src/View/Console/RouteNotFoundStrategy.php
@@ -460,7 +460,7 @@ protected function reportNotFoundReason($e)
         ];
         $report = sprintf("\nReason for failure: %s\n", $reasons[$reason]);
 
-        while ($exception instanceof \Exception || $exception instanceof \Throwable) {
+        while ($exception instanceof \Exception || $exception instanceof \Throwable) {  // @TODO clean up once PHP 7 requirement is enforced
             $report   .= sprintf("Exception: %s\nTrace:\n%s\n", $exception->getMessage(), $exception->getTraceAsString());
             $exception = $exception->getPrevious();
         }

diff --git a/src/View/Http/DefaultRenderingStrategy.php b/src/View/Http/DefaultRenderingStrategy.php
@@ -105,7 +105,7 @@ public function render(MvcEvent $e)
             $view->render($viewModel);
         } catch (\Throwable $ex) {
             $caughtException = $ex;
-        } catch (\Exception $ex) {
+        } catch (\Exception $ex) {  // @TODO clean up once PHP 7 requirement is enforced
             $caughtException = $ex;
         }
 

diff --git a/src/View/Http/RouteNotFoundStrategy.php b/src/View/Http/RouteNotFoundStrategy.php
@@ -250,7 +250,7 @@ protected function injectException($model, $e)
         $model->setVariable('display_exceptions', true);
 
         $exception = $e->getParam('exception', false);
-        if (!$exception instanceof \Exception && !$exception instanceof \Throwable) {
+        if (!$exception instanceof \Exception && !$exception instanceof \Throwable) {  // @TODO clean up once PHP 7 requirement is enforced
             return;
         }