Merge branch 'develop'

Author: CreativeWaDev

README.md

@@ -105,7 +105,7 @@ Each prompt can have validation rules and custom error messages. Validation can
     - **Description**: Checks if the value is a valid date and time with the specified format.
     - **Usage**: `"dateTime" => ["Y-m-d H:i"]`
 
-11. **bool**
+11. **isBool**
     - **Description**: Checks if the value is a boolean.
     - **Usage**: `"bool" => []`
 
@@ -117,11 +117,11 @@ Each prompt can have validation rules and custom error messages. Validation can
     - **Description**: Validates if all of the provided conditions are met.
     - **Usage**: `"allOf" => [["length", [1, 200]], "email"]`
 
-14. **float**
+14. **isFloat**
     - **Description**: Checks if the value is a float.
     - **Usage**: `"float" => []`
 
-15. **int**
+15. **isInt**
     - **Description**: Checks if the value is an integer.
     - **Usage**: `"int" => []`
 
@@ -173,7 +173,7 @@ Each prompt can have validation rules and custom error messages. Validation can
     - **Description**: Checks if the value is not equal to a specified value.
     - **Usage**: `"notEqual" => ["someValue"]`
 
-28. **string**
+28. **isString**
     - **Description**: Checks if the value is a string.
     - **Usage**: `"string" => []`
 
@@ -213,6 +213,6 @@ Each prompt can have validation rules and custom error messages. Validation can
     - **Description**: Checks if the value is an object.
     - **Usage**: `"isObject" => []`
 
-38. **boolVal**
+38. **isBoolVal**
     - **Description**: Checks if the value is a boolean-like value (e.g., "on", "yes", "1", "true").
     - **Usage**: `"boolVal" => []`

Test.php

@@ -38,12 +38,12 @@ public function add(mixed $value, array $validation, ?string $message = null): s
             }
 
             $readableValue = $this->getReadableValue($value);
-            $message = (is_string($message)) ? $message : "Validation-error: %s";
+            $msg = (is_string($message)) ? ", ($message)" : "";
             $this->test[] = [
                 "method" => $method,
                 "args" => $args,
                 "test" => $bool,
-                "message" => sprintf($message, $method),
+                "message" => sprintf("Validation-error: %s", $method) . $msg,
                 "readableValue" => $readableValue,
             ];
         }

Unit.php

@@ -95,8 +95,10 @@ public function execute(): void
         }
         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");
                 }
@@ -149,9 +151,42 @@ private function findFiles($dir): array
         foreach ($iterator as $file) {
             if (fnmatch(static::PATTERN, $file->getFilename()) &&
                 (isset($this->args['path']) || !str_contains($file->getPathname(), "vendor/"))) {
-                $files[] = $file->getPathname();
+                if(!$this->findExcluded($this->exclude(), $dir, $file->getPathname())) {
+                    $files[] = $file->getPathname();
+                }
             }
         }
         return $files;
     }
+
+    /**
+     * Get exclude parameter
+     * @return array
+     */
+    function exclude(): array
+    {
+        $excl = array();
+        if(isset($this->args['exclude'])) {
+            $exclude = explode(',', $this->args['exclude']);
+            foreach ($exclude as $file) {
+                $new = trim($file);
+                $lastChar = substr($new, -1);
+                if($lastChar === "/") {
+                    $new .= "*";
+                }
+                $excl[] = trim($new);
+            }
+        }
+        return $excl;
+    }
+
+    function findExcluded(array $exclArr, string $relativeDir, string $file): bool
+    {
+        foreach ($exclArr as $excl) {
+            if(fnmatch($relativeDir . "/". $excl, $file)) {
+               return true;
+            }
+        }
+        return false;
+    }
 }

unitary renamed to bin/unitary

@@ -1,21 +1,17 @@
 #!/usr/bin/env php
 <?php
+/**
+ * MaplePHP Unitary unit testing library
+ * @example php unitary --path=fullDirPath --exclude="dir1/dir2/
+ */
+require __DIR__ . '/../vendor/autoload.php';
+
 use MaplePHP\Http\Environment;
 use MaplePHP\Http\ServerRequest;
 use MaplePHP\Http\Uri;
 use MaplePHP\Prompts\Command;
 use MaplePHP\Unitary\Unit;
 
-if (!class_exists(Unit::class)) {
-    $dir = realpath(__DIR__ . "/../../");
-    $alFile = (defined("UNITARY_AUTOLOAD_FILE") ? UNITARY_AUTOLOAD_FILE : "$dir/autoload.php");
-    if (is_file($alFile)) {
-        require_once($alFile);
-    } else {
-        die("Please run 'composer install' before running the example test suite");
-    }
-}
-
 $unit = new Unit();
 $command = new Command();
 $env = new Environment();

composer.json

@@ -1,31 +1,41 @@
 {
-    "name": "maplephp/unitary",
-    "type": "library",
-    "description": "PHP Unitary is a lightweight PHP testing library designed to simplify the process of writing and running tests for your PHP code.",
-    "keywords": ["php", "cli", "command line", "test", "testing"],
-    "homepage": "https://wazabii.se",
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "Daniel Ronkainen",
-            "email": "daniel.ronkainen@wazabii.se"
-        },
-        {
-            "name": "MaplePHP",
-            "homepage": "https://wazabii.se"
-        }
-    ],
-    "require": {
-        "php": ">=8.0",
-        "maplephp/dto": "*",
-        "maplephp/http": "*",
-        "maplephp/validate": "*",
-        "maplephp/prompts": "*"
+  "name": "maplephp/unitary",
+  "type": "library",
+  "version": "v1.0.4",
+  "description": "PHP Unitary is a lightweight PHP testing library designed to simplify the process of writing and running tests for your PHP code.",
+  "keywords": [
+    "php",
+    "cli",
+    "command line",
+    "test",
+    "testing"
+  ],
+  "homepage": "https://wazabii.se",
+  "license": "Apache-2.0",
+  "authors": [
+    {
+      "name": "Daniel Ronkainen",
+      "email": "daniel.ronkainen@wazabii.se"
     },
-    "autoload": {
-        "psr-4": {
-            "MaplePHP\\Unitary\\": ""
-        }
-    },
-    "minimum-stability": "dev"
-}
+    {
+      "name": "MaplePHP",
+      "homepage": "https://wazabii.se"
+    }
+  ],
+  "require": {
+    "php": ">=8.0",
+    "maplephp/dto": "^1.0",
+    "maplephp/http": "^1.0",
+    "maplephp/validate": "^1.0",
+    "maplephp/prompts": "^1.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "MaplePHP\\Unitary\\": ""
+    }
+  },
+  "bin": [
+    "bin/unitary"
+  ],
+  "minimum-stability": "dev"
+}