update: add new helper class Valid, update some helper

Author: inhere

src/Helper/Assert.php

@@ -13,49 +13,42 @@
  */
 class Assert
 {
+    /**
+     * @var string
+     */
+    private static string $exClass = InvalidArgumentException::class;
+
     /**
      * @param mixed $value
      * @param string $errMsg
-     *
-     * @return mixed
      */
-    public static function notEmpty(mixed $value, string $errMsg = ''): mixed
+    public static function notEmpty(mixed $value, string $errMsg = ''): void
     {
         if (empty($value)) {
             throw static::createEx($errMsg ?: 'Expected a non-empty value');
         }
-
-        return $value;
     }
 
     /**
      * @param mixed $value
      * @param string $errMsg
-     *
-     * @return mixed
      */
-    public static function notNull(mixed $value, string $errMsg = ''): mixed
+    public static function notNull(mixed $value, string $errMsg = ''): void
     {
         if (null === $value) {
             throw static::createEx($errMsg ?: 'Expected a non-null value');
         }
-
-        return $value;
     }
 
     /**
      * @param string $value
      * @param string $errMsg
-     *
-     * @return string
      */
-    public static function notBlank(string $value, string $errMsg = ''): string
+    public static function notBlank(string $value, string $errMsg = ''): void
     {
         if ('' === $value) {
             throw static::createEx($errMsg ?: 'Expected a non-blank string value');
         }
-
-        return $value;
     }
 
     /**
@@ -64,16 +57,12 @@ public static function notBlank(string $value, string $errMsg = ''): string
      * @param mixed $value1
      * @param mixed $value2
      * @param string $errMsg
-     *
-     * @return bool
      */
-    public static function equals(mixed $value1, mixed $value2, string $errMsg = ''): bool
+    public static function equals(mixed $value1, mixed $value2, string $errMsg = ''): void
     {
         if ($value1 !== $value2) {
             throw static::createEx($errMsg ?: "The $value1 should equals to $value2");
         }
-
-        return true;
     }
 
     /**
@@ -82,175 +71,152 @@ public static function equals(mixed $value1, mixed $value2, string $errMsg = '')
      * @param mixed $value1
      * @param mixed $value2
      * @param string $errMsg
-     *
-     * @return bool
      */
-    public static function notEquals(mixed $value1, mixed $value2, string $errMsg = ''): bool
+    public static function notEquals(mixed $value1, mixed $value2, string $errMsg = ''): void
     {
         if ($value1 === $value2) {
             throw static::createEx($errMsg ?: "The $value1 should not equals to $value2");
         }
-
-        return true;
     }
 
     /**
      * @param bool $value
      * @param string $errMsg
-     *
-     * @return bool
      */
-    public static function isTrue(bool $value, string $errMsg = ''): bool
+    public static function isTrue(bool $value, string $errMsg = ''): void
     {
         if (false === $value) {
             throw static::createEx($errMsg ?: 'Expected a true value');
         }
-
-        return $value;
     }
 
     /**
      * @param bool $value
      * @param string $errMsg
-     *
-     * @return bool
      */
-    public static function isFalse(bool $value, string $errMsg = ''): bool
+    public static function isFalse(bool $value, string $errMsg = ''): void
     {
         if (true === $value) {
             throw static::createEx($errMsg ?: 'Expected a false value');
         }
-
-        return $value;
     }
 
     /**
      * @param mixed $needle
      * @param array $haystack
      * @param string $errMsg
-     *
-     * @return mixed
      */
-    public static function inArray(mixed $needle, array $haystack, string $errMsg = ''): mixed
+    public static function inArray(mixed $needle, array $haystack, string $errMsg = ''): void
     {
         if (!in_array($needle, $haystack, true)) {
             throw static::createEx($errMsg ?: 'Expected a value in array');
         }
-
-        return $needle;
     }
 
     /**
      * Value should != 0
      *
      * @param int $value
      * @param string $errMsg
-     *
-     * @return int
      */
-    public static function notZero(int $value, string $errMsg = ''): int
+    public static function notZero(int $value, string $errMsg = ''): void
     {
         if ($value === 0) {
             throw static::createEx($errMsg ?: 'Expected a non-zero integer value');
         }
-
-        return $value;
     }
 
     /**
      * Natural number. >= 0
      *
      * @param int $value
      * @param string $errMsg
-     *
-     * @return int
      */
-    public static function naturalInt(int $value, string $errMsg = ''): int
+    public static function naturalInt(int $value, string $errMsg = ''): void
     {
         if ($value < 0) {
             throw static::createEx($errMsg ?: 'Expected a natural number value(>=0)');
         }
-
-        return $value;
     }
 
     /**
      * Positive integer. > 0
      *
      * @param int $value
      * @param string $errMsg
-     *
-     * @return int
      */
-    public static function positiveInt(int $value, string $errMsg = ''): int
+    public static function positiveInt(int $value, string $errMsg = ''): void
     {
         if ($value < 1) {
             throw static::createEx($errMsg ?: 'Expected a positive integer value(>0)');
         }
-
-        return $value;
     }
 
     /**
      * @param array $data
      * @param string $key
      * @param string $errMsg
-     *
-     * @return mixed
      */
-    public static function arrayHasKey(array $data, string $key, string $errMsg = ''): mixed
+    public static function arrayHasKey(array $data, string $key, string $errMsg = ''): void
     {
         if (!isset($data[$key])) {
             throw static::createEx($errMsg ?: "Array data must contains key '$key'");
         }
-
-        return $data[$key];
     }
 
     /**
      * @param array $data
      * @param array $keys
      * @param string $errMsg
-     *
-     * @return array
      */
-    public static function arrayHasKeys(array $data, array $keys, string $errMsg = ''): array
+    public static function arrayHasKeys(array $data, array $keys, string $errMsg = ''): void
     {
-        $values = [];
         foreach ($keys as $key) {
             if (!isset($data[$key])) {
                 throw static::createEx($errMsg ?: "Array data must contains key '$key'");
             }
-
-            $values[$key] = $data[$key];
         }
-
-        return $values;
     }
 
     /**
      * @param array $data
      * @param string $key
      * @param string $errMsg
-     *
-     * @return mixed
      */
-    public static function arrayHasNoEmptyKey(array $data, string $key, string $errMsg = ''): mixed
+    public static function arrayHasNoEmptyKey(array $data, string $key, string $errMsg = ''): void
     {
         if (!isset($data[$key]) || empty($data[$key])) {
             throw static::createEx($errMsg ?: "Data must contains key '$key' and value non-empty");
         }
-
-        return $data[$key];
     }
 
+    // ------------- helper methods -------------
+
     /**
      * @param string $errMsg
      *
-     * @return RuntimeException|InvalidArgumentException
+     * @return RuntimeException
      */
     public static function createEx(string $errMsg): RuntimeException
     {
-        return new InvalidArgumentException($errMsg);
+        return new self::$exClass($errMsg);
+    }
+
+    /**
+     * @return string
+     */
+    public static function getExClass(): string
+    {
+        return self::$exClass;
+    }
+
+    /**
+     * @param string $exClass
+     */
+    public static function setExClass(string $exClass): void
+    {
+        if ($exClass) {
+            self::$exClass = $exClass;
+        }
     }
 }