clean up throw

samsonasik · Sep 21, 2018 · 49e8432 · 49e8432
1 parent 5e46e43
commit 49e8432
Showing 1 changed file with 16 additions and 20 deletions.
diff --git a/src/HeroTrait.php b/src/HeroTrait.php
@@ -29,7 +29,7 @@ public function phpFatalErrorHandler($buffer): string
             return $buffer;
         }
 
-        if (0 === strpos($error['message'], 'Uncaught') && $error['type'] !== \E_ERROR) {
+        if (0 === strpos($error['message'], 'Uncaught')) {
             return $buffer;
         }
 
@@ -43,29 +43,25 @@ public function execOnShutdown() : void
             return;
         }
 
-        if (0 === strpos($error['message'], 'Uncaught') && $error['type'] !== \E_ERROR) {
+        if (0 === strpos($error['message'], 'Uncaught')) {
             return;
         }
 
         $errorException = new ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line']);
-        try {
-            if (property_exists($this, 'request')) {
-                $result = $this->exceptionError($errorException, $this->request);
-                $this->result = (string) $result->getBody();
-
-                return;
-            }
-
-            if (property_exists($this, 'mvcEvent')) {
-                ob_start();
-                $this->mvcEvent->setParam('exception', $errorException);
-                $this->exceptionError($this->mvcEvent);
-                $this->result = ob_get_clean();
-
-                return;
-            }
-        } catch (ErrorException $t) {
-            throw $t;
+        if (property_exists($this, 'request')) {
+            $result       = $this->exceptionError($errorException, $this->request);
+            $this->result = (string) $result->getBody();
+
+            return;
+        }
+
+        if (property_exists($this, 'mvcEvent')) {
+            ob_start();
+            $this->mvcEvent->setParam('exception', $errorException);
+            $this->exceptionError($this->mvcEvent);
+            $this->result = ob_get_clean();
+
+            return;
         }
     }