Merge branch 'develop'

Author: danielRConsid

README.md

@@ -38,7 +38,7 @@ Unitary will, by default, find all files prefixed with "unitary-" recursively fr
 
 Start by creating a test file with a name that starts with "unitary-", e.g., "unitary-lib-name.php". You can place the file inside `tests/unitary-lib-name.php` for example.
 
-**Note: All of your library classes should be automatically be autoloaded when used in test file!** 
+**Note: All of your library classes should be automatically be autoloaded if you are using composers autoloader inside your test file!** 
 
 ```php
 <?php
@@ -74,14 +74,14 @@ $unit->add("Checking data type", function($inst) {
 
 $unit->execute();
 ```
-The example above uses both built-in validation and custom validation (see below for all built-in validation options).
+The example above uses both built-in validation and custom validation (see below for all built-in validation options). 
 
 ### 2. Run the Tests
 
 Now you are ready to execute the tests. Open your command line of choice, navigate (cd) to your project's root directory (where your `composer.json` file exists), and execute the following command:
 
 ```bash
-./vendor/bin/unitary
+php vendor/bin/unitary
 ```
 
 And that is it. Your tests have been successfully executed.
@@ -97,15 +97,15 @@ You can change the default root testing path and exclude files or whole director
 The path argument takes both absolute and relative paths. The command below will find all tests recursively from the "tests" directory.
 
 ```bash
-./vendor/bin/unitary --path="./tests/"
+php vendor/bin/unitary --path="./tests/"
 ```
 
 #### 2. Exclude Specific Files or Directories
 
 The exclude argument will always be a relative path from the `--path` argument's path.
 
 ```bash
-./vendor/bin/unitary --exclude="./tests/unitary-query-php, tests/otherTests/*, */extras/*"
+php vendor/bin/unitary --exclude="./tests/unitary-query-php, tests/otherTests/*, */extras/*"
 ```
 
 ## Example Breakdown

Unit.php

@@ -95,10 +95,10 @@ public function execute(): void
         }
         if(count($this->error) > 0) {
             foreach($this->error as $error) {
-                $tests = [];
+                //$tests = [];
                 $this->command->title("\n{$error['message']}");
                 foreach($error['error'] as $row) {
-                    $tests[] = $row['method'];
+                    //$tests[] = $row['method'];
                     $this->command->error("Test-value {$row['readableValue']}");
                     $this->command->error("{$row['message']}\n");
                 }
@@ -150,7 +150,7 @@ private function findFiles($dir): array
         $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
         foreach ($iterator as $file) {
             if (fnmatch(static::PATTERN, $file->getFilename()) &&
-                (isset($this->args['path']) || !str_contains($file->getPathname(), "vendor/"))) {
+                (isset($this->args['path']) || !str_contains($file->getPathname(), DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR ))) {
                 if(!$this->findExcluded($this->exclude(), $dir, $file->getPathname())) {
                     $files[] = $file->getPathname();
                 }
@@ -169,9 +169,10 @@ function exclude(): array
         if(isset($this->args['exclude'])) {
             $exclude = explode(',', $this->args['exclude']);
             foreach ($exclude as $file) {
+                $file = str_replace(['"', "'"], "", $file);
                 $new = trim($file);
                 $lastChar = substr($new, -1);
-                if($lastChar === "/") {
+                if($lastChar === DIRECTORY_SEPARATOR) {
                     $new .= "*";
                 }
                 $excl[] = trim($new);
@@ -180,13 +181,32 @@ function exclude(): array
         return $excl;
     }
 
+    /**
+     * Validate a exclude path
+     * @param array $exclArr
+     * @param string $relativeDir
+     * @param string $file
+     * @return bool
+     */
     function findExcluded(array $exclArr, string $relativeDir, string $file): bool
     {
+        $file = $this->getNaturalPath($file);
         foreach ($exclArr as $excl) {
-            if(fnmatch($relativeDir . "/". $excl, $file)) {
-               return true;
+            $relativeExclPath = $this->getNaturalPath($relativeDir . DIRECTORY_SEPARATOR . $excl);
+            if(fnmatch($relativeExclPath, $file)) {
+                return true;
             }
         }
         return false;
     }
-}
+
+    /**
+     * Get path as natural path
+     * @param string $path
+     * @return string
+     */
+    function getNaturalPath(string $path): string
+    {
+        return str_replace("\\", "/", $path);
+    }
+}

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "maplephp/unitary",
   "type": "library",
-  "version": "v1.0.5",
+  "version": "v1.0.6",
   "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",