Merge pull request #5 from MaplePHP/develop

Remove Strict Severity & Improve Code Structure

Author: wazabii8

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "maplephp/blunder",
   "type": "library",
-  "version": "v1.2.0",
+  "version": "v1.2.1",
   "description": "Blunder is a well-designed PHP error handling framework.",
   "keywords": [
     "php",

src/ExceptionItem.php

@@ -120,7 +120,7 @@ public function getStatus(): string
             E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR, 0 => "error",
             E_WARNING, E_USER_WARNING, E_COMPILE_WARNING => "warning",
             E_NOTICE, E_USER_NOTICE => "notice",
-            E_STRICT, E_DEPRECATED, E_USER_DEPRECATED => "info",
+            E_DEPRECATED, E_USER_DEPRECATED => "info",
             default => "debug",
         };
 

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

@@ -21,7 +21,7 @@
 use Closure;
 use Throwable;
 
-abstract class AbstractAbstractHandler implements AbstractHandlerInterface
+abstract class AbstractHandler implements AbstractHandlerInterface
 {
     /**
      * Maximum trace depth (memory improvement)
@@ -33,6 +33,7 @@ abstract class AbstractAbstractHandler implements AbstractHandlerInterface
     protected static bool $enabledTraceLines = false;
 
     protected bool $throwException = true;
+    protected ?Throwable $exception = null;
     protected ?HttpMessagingInterface $http = null;
     protected ?Closure $eventCallable = null;
     protected ?SeverityLevelPool $severityLevelPool = null;
@@ -52,10 +53,10 @@ abstract protected function getCodeBlock(array $data, string $code, int $index =
      * If you want Blunder to trigger a specific exit code on error,
      * specify the code using this method.
      *
-     * @param int $code The exit code to use.
+     * @param ?int $code The exit code to use.
      * @return $this
      */
-    public function setExitCode(int $code): self
+    public function setExitCode(?int $code): self
     {
         self::$exitCode = $code;
         return $this;
@@ -126,7 +127,7 @@ final public function setSeverity(SeverityLevelPool $severity): self
      * @param int $errLine
      * @param array $context
      * @return bool
-     * @throws ErrorException
+     * @throws Throwable
      */
     public function errorHandler(int $errNo, string $errStr, string $errFile, int $errLine = 0, array $context = []): bool
     {
@@ -137,18 +138,27 @@ public function errorHandler(int $errNo, string $errStr, string $errFile, int $e
                 return $redirectHandler;
             }
             $this->cleanOutputBuffers();
-            $exception = new BlunderErrorException($errStr, 0, $errNo, $errFile, $errLine);
+            $this->exception = new BlunderErrorException($errStr, 0, $errNo, $errFile, $errLine);
             if ($this->throwException) {
-                $exception->setPrettyMessage($this->getErrorMessage($exception));
-                throw $exception;
+                $this->exception->setPrettyMessage($this->getErrorMessage($this->exception));
+                throw $this->exception;
             } else {
-                $this->exceptionHandler($exception);
+                $this->exceptionHandler($this->exception);
             }
             return true;
         }
         return false;
     }
 
+    /**
+     * Get exception if has been initiated
+     * @return Throwable|null
+     */
+    public function getException(): ?Throwable
+    {
+        return $this->exception;
+    }
+
     /**
      * Handle the errorHandler or redirect to PHP error to a new handler or
      *
@@ -241,7 +251,7 @@ protected function getTrace(throwable $exception): array
      */
     protected function emitter(throwable $exception, ?ExceptionItem $exceptionItem = null): void
     {
-        $this->cleanOutputBuffers();
+        //$this->cleanOutputBuffers();
 
         if (!headers_sent()) {
             header_remove('location');

src/Handlers/HtmlHandler.php

@@ -13,7 +13,7 @@
 use MaplePHP\Blunder\Interfaces\HandlerInterface;
 use Throwable;
 
-class HtmlHandler extends AbstractAbstractHandler implements HandlerInterface
+class HtmlHandler extends AbstractHandler implements HandlerInterface
 {
     /** @var string */
     public const CSS_FILE = 'main.css';
@@ -22,6 +22,11 @@ class HtmlHandler extends AbstractAbstractHandler implements HandlerInterface
 
     protected static bool $enabledTraceLines = true;
 
+    public function testssss($www1)
+    {
+        return "Lorem1";
+    }
+
     /**
      * Exception handler output
      * @param Throwable $exception

src/Handlers/JsonHandler.php

@@ -13,7 +13,7 @@
 use MaplePHP\Blunder\Interfaces\HandlerInterface;
 use Throwable;
 
-class JsonHandler extends AbstractAbstractHandler implements HandlerInterface
+class JsonHandler extends AbstractHandler implements HandlerInterface
 {
     protected static bool $enabledTraceLines = true;
 

src/Handlers/TextHandler.php

@@ -13,7 +13,7 @@
 use MaplePHP\Blunder\SeverityLevelPool;
 use Throwable;
 
-class TextHandler extends AbstractAbstractHandler implements HandlerInterface
+class TextHandler extends AbstractHandler implements HandlerInterface
 {
     protected static bool $enabledTraceLines = true;
 

src/Handlers/XmlHandler.php

@@ -14,7 +14,7 @@
 use SimpleXMLElement;
 use Throwable;
 
-class XmlHandler extends AbstractAbstractHandler implements HandlerInterface
+class XmlHandler extends AbstractHandler implements HandlerInterface
 {
     protected static bool $enabledTraceLines = true;
 

src/SeverityLevelPool.php

@@ -28,7 +28,6 @@ class SeverityLevelPool
         E_USER_ERROR => 'E_USER_ERROR',
         E_USER_WARNING => 'E_USER_WARNING',
         E_USER_NOTICE => 'E_USER_NOTICE',
-        E_STRICT => 'E_STRICT',
         E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
         E_DEPRECATED => 'E_DEPRECATED',
         E_USER_DEPRECATED => 'E_USER_DEPRECATED',

tests/unitary-blunder.php tests/unitary-blunder-event.phptests/unitary-blunder.php renamed to tests/unitary-blunder-event.php

@@ -14,7 +14,7 @@
 
 $unit = new Unit();
 
-$unit->case("MaplePHP pretty error handler test", function ($inst) {
+$unit->case("MaplePHP Blunder event test", function ($inst) {
 
     // SilentHandler will hide the error that I have added in this file
     // and is using to test the Blunder library

tests/unitary-blunder-handlers.php

@@ -0,0 +1,81 @@
+#!/usr/bin/env php
+<?php
+/**
+ * This is how a template test file should look like but
+ * when used in MaplePHP framework you can skip the "bash code" at top and the "autoload file"!
+ */
+
+use MaplePHP\Blunder\ExceptionItem;
+use MaplePHP\Blunder\Handlers\CliHandler;
+use MaplePHP\Blunder\Handlers\HtmlHandler;
+use MaplePHP\Blunder\Handlers\JsonHandler;
+use MaplePHP\Blunder\Handlers\PlainTextHandler;
+use MaplePHP\Blunder\Handlers\SilentHandler;
+use MaplePHP\Blunder\Handlers\TextHandler;
+use MaplePHP\Blunder\Handlers\XmlHandler;
+use MaplePHP\Blunder\Interfaces\HandlerInterface;
+use MaplePHP\Blunder\Run;
+use MaplePHP\Unitary\TestWrapper;
+use MaplePHP\Unitary\Unit;
+
+// If you add true to Unit it will run in quite mode
+// and only report if it finds any errors!
+
+
+$unit = new Unit();
+
+$unit->case("MaplePHP Blunder handler test", function ($inst) {
+
+    // 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->severity()
+        ->excludeSeverityLevels([E_WARNING, E_USER_WARNING])
+        ->redirectTo(function ($errNo, $errStr, $errFile, $errLine) use ($inst) {
+
+            $func = function (string $className) {
+                $dispatch = $this->wrapper($className)->bind(function ($exception) {
+                    $this->setExitCode(null);
+                    ob_start();
+                    $this->exceptionHandler($exception);
+                    return ob_get_clean();
+                });
+                return $dispatch(new Exception("Mock exception"));
+            };;
+
+            $inst->add($func(HtmlHandler::class), [
+                'length' => 100,
+                'isFullHtml' => true
+            ], "HtmlHandler do not return a valid HTML string");
+
+            $inst->add($func(JsonHandler::class), [
+                'length' => 100,
+                'isJson' => true
+            ], "JsonHandler do not return a valid JSON string");
+
+            $inst->add($func(TextHandler::class), [
+                'length' => [10],
+            ], "TextHandler do not return a valid CLI string");
+
+            $inst->add($func(PlainTextHandler::class), [
+                'length' => [10],
+            ], "PlainTextHandler do not return a valid CLI string");
+
+            $inst->add($func(XmlHandler::class), [
+                'length' => [10],
+            ], "CliHandler do not return a valid CLI string");
+
+            $inst->add($func(CliHandler::class), [
+                'length' => [1],
+            ], "CliHandler do not return a valid CLI string");
+
+            return true;
+        });
+    $run->load();
+
+    // Mock error
+    echo $helloWorld;
+});
+
+$unit->execute();