Merge pull request #14 from flownative/bugfix/483

Correctly output error with CLI SAPI
flownative · Jul 5, 2022 · aece81c · aece81c
2 parents ff25743 + a881168
commit aece81c
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/Classes/Exception/ProductionExceptionHandler.php b/Classes/Exception/ProductionExceptionHandler.php
@@ -35,28 +35,26 @@ public function handleException($exception)
 
         $this->renderingOptions = $this->resolveCustomRenderingOptions($exception);
 
+        $exceptionWasLogged = false;
         if ($this->throwableStorage instanceof ThrowableStorageInterface && isset($this->renderingOptions['logException']) && $this->renderingOptions['logException']) {
             $message = $this->throwableStorage->logThrowable($exception);
             $this->logger->critical($message);
+            $exceptionWasLogged = true;
+        }
+
+        try {
+            if ($sentryClient = self::getSentryClient()) {
+                $sentryClient->captureThrowable($exception);
+            }
+        } catch (\Throwable $e) {
         }
 
         switch (PHP_SAPI) {
             case 'cli':
-                try {
-                    if ($sentryClient = self::getSentryClient()) {
-                        $sentryClient->captureThrowable($exception);
-                    }
-                } catch (\Throwable $e) {
-                }
-                echo $this->buildView($exception, $this->renderingOptions)->render();
+                # Doesn't return:
+                $this->echoExceptionCli($exception, $exceptionWasLogged);
             break;
             default:
-                try {
-                    if ($sentryClient = self::getSentryClient()) {
-                        $sentryClient->captureThrowable($exception);
-                    }
-                } catch (\Throwable $e) {
-                }
                 $this->echoExceptionWeb($exception);
         }
     }