Merge pull request #3 from MaplePHP/develop

Improve OB handling

Author: danielRConsid

composer.json

@@ -36,7 +36,7 @@
   },
   "autoload": {
     "psr-4": {
-      "MaplePHP\\Blunder\\": ""
+      "MaplePHP\\Blunder\\": "src"
     }
   },
   "minimum-stability": "dev"

ExceptionItem.php renamed to src/ExceptionItem.php

@@ -28,6 +28,7 @@ abstract class AbstractHandler implements HandlerInterface
     protected const MAX_TRACE_LENGTH = 40;
 
     protected bool $throwException = true;
+    protected static bool $disableExitCode = false;
     protected ?HttpMessagingInterface $http = null;
     protected ?Closure $eventCallable = null;
     protected int $severity = E_ALL;
@@ -41,6 +42,17 @@ abstract class AbstractHandler implements HandlerInterface
      */
     abstract protected function getCodeBlock(array $data, string $code, int $index = 0): string;
 
+    /**
+     * You can disable exit code 1 so Blunder can be used in test cases
+     * @param bool $disable
+     * @return $this
+     */
+    public function disableExitCode(bool $disable = true): self
+    {
+        self::$disableExitCode = $disable;
+        return $this;
+    }
+
     /**
      * The event callable will be triggered when an error occur.
      * Note: Will add PSR-14 support for dispatch in the future.
@@ -130,6 +142,8 @@ public function shutdownHandler(): void
                 );
             }
         }
+
+        exit((int)(!self::$disableExitCode));
     }
 
 
@@ -170,6 +184,11 @@ protected function emitter(throwable $exception, ?ExceptionItem $exceptionItem =
     {
         $this->cleanOutputBuffers();
 
+        if (!headers_sent()) {
+            header_remove('location');
+            header('HTTP/1.1 500 Internal Server Error');
+        }
+
         $response = $this->getHttp()->response()->withoutHeader('location');
         $response->createHeaders();
         $response->executeHeaders();
@@ -183,9 +202,7 @@ protected function emitter(throwable $exception, ?ExceptionItem $exceptionItem =
         }
         $stream->rewind();
         echo $stream->read((int)$stream->getSize());
-
-        // Exit execute to prevent response under to be triggered in some cases
-        exit();
+        exit((int)(!self::$disableExitCode));
     }
 
     /**

Handlers/AbstractHandler.php renamed to src/Handlers/AbstractHandler.php

@@ -58,4 +58,10 @@ public function shutdownHandler(): void;
      */
     public function event(Closure $event): void;
 
+    /**
+     * Set expected severity mask
+     * @param int $severity
+     * @return self
+     */
+    public function setSeverity(int $severity): self;
 }

Handlers/CliHandler.php renamed to src/Handlers/CliHandler.php

@@ -17,6 +17,7 @@ class Run
 {
     private HandlerInterface $handler;
     private ?SeverityLevelPool $severity = null;
+    private bool $removeLocationHeader = false;
 
     public function __construct(HandlerInterface $handler, ?HttpMessagingInterface $http = null)
     {
@@ -26,6 +27,28 @@ public function __construct(HandlerInterface $handler, ?HttpMessagingInterface $
         }
     }
 
+    /**
+     * You can disable exit code 1 so Blunder can be used in test cases
+     * @param bool $disable
+     * @return $this
+     */
+    public function disableExitCode(bool $disable = true): self
+    {
+        $this->handler->disableExitCode($disable);
+        return $this;
+    }
+
+    /**
+     * Enable or disable the removal of the 'Location' header to prevent redirections.
+     * @param bool $removeRedirect
+     * @return $this
+     */
+    public function removeLocationHeader(bool $removeRedirect): self
+    {
+        $this->removeLocationHeader = $removeRedirect;
+        return $this;
+    }
+
     /**
      * Access severity instance to set or exclude severity levels from error handler
      * @return SeverityLevelPool
@@ -56,14 +79,15 @@ public function event(Closure $event): void
      */
     public function load(): void
     {
-        if (!headers_sent()) {
+        if ($this->removeLocationHeader && !headers_sent()) {
             header_remove('location');
         }
-
+        ob_start();
         $this->handler->setSeverity($this->severity()->getSeverityLevelMask());
         set_error_handler([$this->handler, "errorHandler"], $this->severity()->getSeverityLevelMask());
         set_exception_handler([$this->handler, "exceptionHandler"]);
         register_shutdown_function([$this->handler, "shutdownHandler"]);
+        ob_clean();
     }
 
 }

Handlers/HtmlHandler.php renamed to src/Handlers/HtmlHandler.php

@@ -19,9 +19,8 @@
     // SilentHandler will hide the error that I have added in this file
     // and is using to test the Blunder library
     $run = new Run(new SilentHandler());
+    $run->disableExitCode();
     $run->event(function ($item, $http) use ($inst) {
-
-
         $inst->add($item->getStatus(), function () {
             return $this->equal("warning");