Improve styling

Author: wazabii8

Test.php

@@ -3,12 +3,14 @@
 
 namespace MaplePHP\Unitary;
 
+use ErrorException;
 use MaplePHP\DTO\Format\Str;
 use MaplePHP\Validate\Inp;
 use InvalidArgumentException;
 
 class Test
 {
+    private array $cases = [];
     private array $test = [];
 
     /**
@@ -17,9 +19,11 @@ class Test
      * @param array $validation
      * @param string|null $message
      * @return $this
+     * @throws ErrorException
      */
     public function add(mixed $value, array $validation, ?string $message = null): self
     {
+        $this->cases[] = $validation;
         foreach($validation as $method => $args) {
             if(is_callable($args)) {
                 $bool = $args($this->valid($value), $value);
@@ -43,14 +47,23 @@ public function add(mixed $value, array $validation, ?string $message = null): s
                 "method" => $method,
                 "args" => $args,
                 "test" => $bool,
-                "message" => sprintf("Validation-error: %s", $method) . $msg,
+                "message" => $message,
                 "readableValue" => $readableValue,
             ];
         }
 
         return $this;
     }
 
+    /**
+     * Will return the test results as an array
+     * @return array
+     */
+    public function getTestCases(): array
+    {
+        return $this->cases;
+    }
+
     /**
      * Will return the test results as an array
      * @return array
@@ -73,6 +86,7 @@ protected function valid(mixed $value): Inp {
      * Used to get a readable value
      * @param mixed $value
      * @return string
+     * @throws ErrorException
      */
     protected function getReadableValue(mixed $value): string {
         if (is_bool($value)) {
@@ -107,6 +121,7 @@ protected function getReadableValue(mixed $value): string {
      * Used to get exception to the readable value
      * @param string $value
      * @return string
+     * @throws ErrorException
      */
     final protected function excerpt(string $value): string
     {

Unit.php

@@ -21,6 +21,8 @@ class Unit
     private array $units;
     private int $index = 0;
     private array $error;
+    private static string $file = "";
+    private static array $info = [];
 
     public function __construct(bool $quite = false)
     {
@@ -75,18 +77,23 @@ public function add(string $message, callable $callback): void
         $data = $test->getTestResult();
         $index = $this->index-1;
 
-        $this->error[$index] = [
-            'message' => $message
+        $count = count($test->getTestCases());
+        $this->error['info'] = [
+            'count' => $count,
+            'total' => $count
         ];
+        $this->error['feed'][$index] = [
+            'message' => $message,
+            'file' => self::$file,
+            'error' => []
+        ];
+
         foreach($data as $key => $row) {
             if(!$row['test']) {
-                $hasError = true;
-                $this->error[$index]['error'][$key] = $row;
+                $this->error['feed'][$index]['error'][$key] = $row;
+                $this->error['info']['count']--;
             }
         }
-        if(!$hasError) {
-            unset($this->error[$index]);
-        }
     }
 
     /**
@@ -127,25 +134,49 @@ public function execute(): void
         $run = new Run(new CliHandler());
         $run->load();
 
-        if(!is_null($this->title) && (!$this->quite || count($this->error) > 0)) {
-            $this->command->title("\n--------- $this->title ---------");
-        }
-        if(count($this->error) > 0) {
-            foreach($this->error as $error) {
-                //$tests = [];
-                $this->command->title("\n{$error['message']}");
-                foreach($error['error'] as $row) {
-                    //$tests[] = $row['method'];
-                    $this->command->error("Test-value {$row['readableValue']}");
-                    $this->command->error("{$row['message']}\n");
+
+
+        $this->command->message("");
+
+        foreach($this->error['feed'] as $error) {
+
+            $color = ($error['error'] ? "red" : "blue");
+            $flag = $this->command->getAnsi()->style(['blueBg', 'white'],  " PASS ");
+            if($error['error']) {
+                $flag = $this->command->getAnsi()->style(['redBg', 'white'],  " FAIL ");
+            }
+
+            $this->command->message("");
+            $this->command->message(
+                $flag .
+                " " .
+                $this->command->getAnsi()->style(["bold"],  $this->formatFileTitle($error['file'])) .
+                " - " .
+                $this->command->getAnsi()->style(["bold", $color],  $error['message'])
+            );
+            foreach($error['error'] as $row) {
+                $this->command->message("");
+
+                $this->command->message($this->command->getAnsi()->style(["bold", "red"], "Error: {$row['message']}"));
+                $this->command->message($this->command->getAnsi()->bold("Value: ") . "{$row['readableValue']}");
+                if(is_string($row['method'])) {
+                    $this->command->message($this->command->getAnsi()->bold("Validation: ") . "{$row['method']}");
                 }
+
             }
 
-        } elseif(!$this->quite) {
-            $this->command->approve("Every test has been successfully run!");
+            $this->command->message("");
+            $this->command->message(
+                $this->command->getAnsi()->bold("Passed: ") .
+                $this->command->getAnsi()->style([$color, "bold"], $this->error['info']['count'] . "/" . $this->error['info']['total']));
         }
 
-        $this->command->message($this->output);
+
+
+
+        if($this->output) {
+            $this->command->message($this->output);
+        }
     }
 
     /**
@@ -162,6 +193,7 @@ public function executeAll(string $directory): void
         } else {
             foreach ($files as $file) {
                 extract($this->args, EXTR_PREFIX_SAME, "wddx");
+                self::$file = $file;
                 require_once ($file);
             }
         }
@@ -248,4 +280,27 @@ function getNaturalPath(string $path): string
     {
         return str_replace("\\", "/", $path);
     }
+    /**
+     * Get path as natural path
+     * @param string $path
+     * @return string
+     */
+    function getUnnaturalPath(string $path): string
+    {
+        return str_replace("/", "\\", $path);
+    }
+
+    /**
+     * Make file path into a title
+     * @param string $file
+     * @return string
+     */
+    function formatFileTitle(string $file): string
+    {
+        $file = explode("/", $file);
+        $file = array_chunk(array_reverse($file), 3);
+        $file = implode("\\", array_reverse($file[0]));
+        $exp = explode('.', $file);
+        return ".." . reset($exp);
+    }
 }