Merge pull request #3 from MaplePHP/develop

Fix title and path

Author: danielRConsid

Unit.php

@@ -13,7 +13,7 @@ class Unit
     const PATTERN = 'unitary-*.php';
     private Command $command;
     private bool $quite;
-    private ?string $title;
+    private ?string $title = null;
     private array $args = [];
     private array $units;
     private int $index = 0;
@@ -90,7 +90,7 @@ public function add(string $message, callable $callback): void
      */
     public function execute(): void
     {
-        if(!is_null($this->title) && !$this->quite || count($this->error) > 0) {
+        if(!is_null($this->title) && (!$this->quite || count($this->error) > 0)) {
             $this->command->title("\n--------- $this->title ---------");
         }
         if(count($this->error) > 0) {
@@ -147,7 +147,7 @@ private function findFiles($dir): array
         $files = [];
         $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
         foreach ($iterator as $file) {
-            if (fnmatch(static::PATTERN, $file->getFilename())) {
+            if(isset($this->args['path']) || strpos($file->getPathname(), "vendor/") === false) {
                 $files[] = $file->getPathname();
             }
         }

composer.json

@@ -19,7 +19,7 @@
         "php": ">=8.0",
         "maplephp/dto": "^1.0",
         "maplephp/http": "^1.0",
-        "maplephp/validate": "^1.0",
+        "maplephp/validate": "^1.0.0",
         "maplephp/prompts": "^1.0"
     },
     "autoload": {

tools/unitary

@@ -8,7 +8,7 @@ use MaplePHP\Unitary\Unit;
 
 if (!class_exists(Unit::class)) {
     $dir = realpath(__DIR__ . "/../../../");
-    $alFile = (defined("UNITARY_AUTOLOAD_FILE") ? UNITARY_AUTOLOAD_FILE : "$dir/vendor/autoload.php");
+    $alFile = (defined("UNITARY_AUTOLOAD_FILE") ? UNITARY_AUTOLOAD_FILE : "$dir/autoload.php");
     if (is_file($alFile)) {
         require_once($alFile);
     } else {
@@ -24,15 +24,15 @@ $request = new ServerRequest(new Uri($env->getUriParts([
 ])), $env);
 
 $data = $request->getCliArgs();
-$defaultPath = (defined("UNITARY_PATH") ? UNITARY_PATH : null);
+$defaultPath = (defined("UNITARY_PATH") ? UNITARY_PATH : "./");
 
 try {
     $path = ($data['path'] ?? $defaultPath);
     if(!isset($path)) {
         throw new Exception("Path not specified: --path=path/to/dir");
     }
 
-    $testDir = realpath($data['path']);
+    $testDir = realpath($path);
     if(!is_dir($testDir)) {
         throw new Exception("Test directory '$testDir' does not exist");
     }