v1.2.0

bin/unitary

@@ -11,7 +11,7 @@ use MaplePHP\Http\Environment;
 use MaplePHP\Http\ServerRequest;
 use MaplePHP\Http\Uri;
 use MaplePHP\Prompts\Command;
-use MaplePHP\Unitary\FileIterator;
+use MaplePHP\Unitary\Utils\FileIterator;
 
 $command = new Command();
 $env = new Environment();
@@ -33,7 +33,7 @@ try {
         throw new Exception("Test directory '$testDir' does not exist");
     }
     $unit = new FileIterator($data);
-    $unit->executeAll($testDir);
+    $unit->executeAll($testDir, $defaultPath);
 
 } catch (Exception $e) {
     $command->error($e->getMessage());

composer.json

@@ -31,6 +31,9 @@
     "maplephp/prompts": "^1.0"
   },
   "autoload": {
+    "files": [
+      "src/Setup/assert-polyfill.php"
+    ],
     "psr-4": {
       "MaplePHP\\Unitary\\": "src"
     }

src/Expect.php

@@ -0,0 +1,197 @@
+<?php
+/**
+ * Expect — Part of the MaplePHP Unitary Testing Library
+ *
+ * @package:    MaplePHP\Unitary
+ * @author:     Daniel Ronkainen
+ * @licence:    Apache-2.0 license, Copyright © Daniel Ronkainen
+ *              Don't delete this comment, it's part of the license.
+ */
+declare(strict_types=1);
+
+namespace MaplePHP\Unitary;
+
+use Exception;
+use Throwable;
+use MaplePHP\Validate\ValidationChain;
+
+/**
+ * @api
+ */
+class Expect extends ValidationChain
+{
+
+    protected mixed $initValue = null;
+    protected Throwable|false|null $except = null;
+
+    /**
+     * Validate exception instance
+     *
+     * @param string|object|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function isThrowable(string|object|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $this->setValue($except);
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isClass((string)$compare));
+        return $this;
+    }
+
+    /**
+     * Validate exception message
+     *
+     * @param string|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function hasThrowableMessage(string|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $this->setValue($except->getMessage());
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isEqualTo($compare));
+        return $this;
+    }
+
+    /**
+     * Validate exception code
+     *
+     * @param int|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function hasThrowableCode(int|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $this->setValue($except->getCode());
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isEqualTo($compare));
+        return $this;
+    }
+
+    /**
+     * Validate exception Severity
+     *
+     * @param int|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function hasThrowableSeverity(int|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $value = method_exists($except, 'getSeverity') ? $except->getSeverity() : 0;
+            $this->setValue($value);
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isEqualTo($compare));
+        return $this;
+    }
+
+    /**
+     * Validate exception file
+     *
+     * @param string|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function hasThrowableFile(string|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $this->setValue($except->getFile());
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isEqualTo($compare));
+        return $this;
+    }
+
+    /**
+     * Validate exception line
+     *
+     * @param int|callable $compare
+     * @return $this
+     * @throws Exception
+     */
+    public function hasThrowableLine(int|callable $compare): self
+    {
+        if($except = $this->getException()) {
+            $this->setValue($except->getLine());
+        }
+        /** @psalm-suppress PossiblyInvalidCast */
+        $this->validateExcept(__METHOD__, $compare, fn() => $this->isEqualTo($compare));
+        return $this;
+    }
+
+    /**
+     * Helper to validate the exception instance against the provided callable.
+     *
+     * @param string $name
+     * @param string|int|object|callable $compare
+     * @param callable $fall
+     * @return self
+     */
+    protected function validateExcept(string $name, int|string|object|callable $compare, callable $fall): self
+    {
+        $pos = strrpos($name, '::');
+        $name = ($pos !== false) ? substr($name, $pos + 2) : $name;
+        $this->mapErrorValidationName($name);
+        if(is_callable($compare)) {
+            $compare($this);
+        } else {
+            $fall($this);
+        }
+
+        if(is_null($this->initValue)) {
+            $this->initValue = $this->getValue();
+        }
+
+        if($this->except === false) {
+            $this->setValue(null);
+        }
+        return $this;
+    }
+
+    /**
+     * Used to get the first value before any validation is performed and
+     * any changes to the value are made.
+     *
+     * @return mixed
+     */
+    public function getInitValue(): mixed
+    {
+        return $this->initValue;
+    }
+
+    /**
+     * Retrieves the exception instance if one has been caught,
+     * otherwise attempts to invoke a callable value to detect any exception.
+     *
+     * @return Throwable|false Returns the caught exception if available, or false if no exception occurs.
+     * @throws Exception Throws an exception if the provided value is not callable.
+     */
+    protected function getException(): Throwable|false
+    {
+        if (!is_null($this->except)) {
+            return $this->except;
+        }
+
+        $expect = $this->getValue();
+        if(!is_callable($expect)) {
+            throw new Exception("Except method only accepts callable");
+        }
+        try {
+            $expect();
+            $this->except = false;
+        } catch (Throwable $exception) {
+            $this->except = $exception;
+            return $this->except;
+        }
+        return false;
+
+    }
+}

src/Handlers/FileHandler.php

@@ -1,5 +1,12 @@
 <?php
-
+/**
+ * FileHandler — Part of the MaplePHP Unitary Testing Library
+ *
+ * @package:    MaplePHP\Unitary
+ * @author:     Daniel Ronkainen
+ * @licence:    Apache-2.0 license, Copyright © Daniel Ronkainen
+ *              Don't delete this comment, it's part of the license.
+ */
 declare(strict_types=1);
 
 namespace MaplePHP\Unitary\Handlers;
@@ -8,7 +15,7 @@
 use MaplePHP\Http\UploadedFile;
 use MaplePHP\Prompts\Command;
 
-class FileHandler implements HandlerInterface
+final class FileHandler implements HandlerInterface
 {
     private string $file;
     private Stream $stream;
@@ -17,6 +24,7 @@ class FileHandler implements HandlerInterface
     /**
      * Construct the file handler
      * The handler will pass stream to a file
+     *
      * @param string $file
      */
     public function __construct(string $file)
@@ -29,6 +37,7 @@ public function __construct(string $file)
 
     /**
      * Access the command stream
+     *
      * @return Command
      */
     public function getCommand(): Command
@@ -39,6 +48,7 @@ public function getCommand(): Command
     /**
      * Execute the handler
      * This will automatically be called inside the Unit execution
+     *
      * @return void
      */
     public function execute(): void

src/Handlers/HandlerInterface.php

@@ -1,5 +1,12 @@
 <?php
-
+/**
+ * HandlerInterface — Part of the MaplePHP Unitary Testing Library
+ *
+ * @package:    MaplePHP\Unitary
+ * @author:     Daniel Ronkainen
+ * @licence:    Apache-2.0 license, Copyright © Daniel Ronkainen
+ *              Don't delete this comment, it's part of the license.
+ */
 declare(strict_types=1);
 
 namespace MaplePHP\Unitary\Handlers;

src/Handlers/HtmlHandler.php

@@ -1,13 +1,20 @@
 <?php
-
+/**
+ * HtmlHandler — Part of the MaplePHP Unitary Testing Library
+ *
+ * @package:    MaplePHP\Unitary
+ * @author:     Daniel Ronkainen
+ * @licence:    Apache-2.0 license, Copyright © Daniel Ronkainen
+ *              Don't delete this comment, it's part of the license.
+ */
 declare(strict_types=1);
 
 namespace MaplePHP\Unitary\Handlers;
 
 use MaplePHP\Http\Stream;
 use MaplePHP\Prompts\Command;
 
-class HtmlHandler implements HandlerInterface
+final class HtmlHandler implements HandlerInterface
 {
     private Stream $stream;
     private Command $command;