update: add isFile assert method and some tests

Author: inhere

src/Helper/Assert.php

@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use LogicException;
 use function in_array;
+use function is_dir;
 
 /**
  * class Assert
@@ -258,6 +259,32 @@ public static function arrayHasNoEmptyKey(array $data, string $key, string $errM
         }
     }
 
+    /**
+     * @param string $path
+     * @param string $errMsg
+     *
+     * @return void
+     */
+    public static function isDir(string $path, string $errMsg = ''): void
+    {
+        if (!$path || !is_dir($path)) {
+            throw static::createEx($errMsg ?: "No such dir: $path");
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $errMsg
+     *
+     * @return void
+     */
+    public static function isFile(string $path, string $errMsg = ''): void
+    {
+        if (!$path || !is_file($path)) {
+            throw static::createEx($errMsg ?: "No such file: $path");
+        }
+    }
+
     // ------------- helper methods -------------
 
     /**

src/Helper/Valid.php

@@ -3,7 +3,7 @@
 namespace Toolkit\Stdlib\Helper;
 
 use InvalidArgumentException;
-use RuntimeException;
+use LogicException;
 use function in_array;
 
 /**
@@ -111,7 +111,7 @@ public static function isTrue(bool $value, string $errMsg = ''): bool
             throw static::createEx($errMsg ?: 'Expected a true value');
         }
 
-        return $value;
+        return true;
     }
 
     /**
@@ -126,7 +126,7 @@ public static function isFalse(bool $value, string $errMsg = ''): bool
             throw static::createEx($errMsg ?: 'Expected a false value');
         }
 
-        return $value;
+        return true;
     }
 
     /**
@@ -242,7 +242,7 @@ public static function arrayHasKeys(array $data, array $keys, string $errMsg = '
      */
     public static function arrayHasNoEmptyKey(array $data, string $key, string $errMsg = ''): mixed
     {
-        if (!isset($data[$key]) || empty($data[$key])) {
+        if (empty($data[$key])) {
             throw static::createEx($errMsg ?: "Data must contains key '$key' and value non-empty");
         }
 
@@ -254,9 +254,9 @@ public static function arrayHasNoEmptyKey(array $data, string $key, string $errM
     /**
      * @param string $errMsg
      *
-     * @return RuntimeException
+     * @return LogicException
      */
-    public static function createEx(string $errMsg): RuntimeException
+    public static function createEx(string $errMsg): LogicException
     {
         return new self::$exClass($errMsg);
     }

test/Helper/AssertTest.php

@@ -55,4 +55,19 @@ public function testAssert_bool(): void
         $e = $this->tryCatchRun(fn() => Assert::isTrue(false, 'custom error'));
         $this->assertException($e, 'custom error');
     }
+
+    public function testAssert_FS(): void
+    {
+        $e = $this->tryCatchRun(fn() => Assert::isFile(__DIR__ . '/AssertTest.php'));
+        $this->assertException($e, 'NO ERROR', -1);
+
+        $e = $this->tryCatchRun(fn() => Assert::isFile('./not-exists.file'));
+        $this->assertException($e, 'No such file: ./not-exists.file');
+
+        $e = $this->tryCatchRun(fn() => Assert::isDir(__DIR__));
+        $this->assertException($e, 'NO ERROR', -1);
+
+        $e = $this->tryCatchRun(fn() => Assert::isDir('./not-exists'));
+        $this->assertException($e, 'No such dir: ./not-exists');
+    }
 }