Merge branch 'develop'

Author: wazabii8

Inp.php

@@ -9,14 +9,17 @@
 
 namespace MaplePHP\Validate;
 
+use ErrorException;
 use Exception;
+use http\Exception\InvalidArgumentException;
+use MaplePHP\DTO\MB;
 use MaplePHP\Validate\Interfaces\InpInterface;
 use MaplePHP\DTO\Format\Str;
 use DateTime;
 
 class Inp implements InpInterface
 {
-    const WHITELIST_OPERATORS = [
+    public const WHITELIST_OPERATORS = [
         '!=',
         '<',
         '<=',
@@ -42,22 +45,36 @@ class Inp implements InpInterface
 
     /**
      * Start instance
-     * @param  mixed $value the input value
+     * @param mixed $value the input value
+     * @throws ErrorException
      */
     public function __construct(mixed $value)
     {
         $this->value = $value;
         $this->dateTime = new DateTime("now");
         if(is_string($value) || is_numeric($value)) {
-            $this->length = $this->getLength($value);
+            $this->length = $this->getLength((string)$value);
             $this->getStr = new Str($this->value);
         }
     }
 
+    /**
+     * Immutable: Validate against new value
+     * @param mixed $value
+     * @return InpInterface
+     */
+    public function withValue(mixed $value): InpInterface
+    {
+        $inst = clone $this;
+        $inst->value = $value;
+        return $inst;
+    }
+
     /**
      * Start instance
-     * @param  string $value the input value
+     * @param string $value the input value
      * @return self
+     * @throws ErrorException
      */
     public static function value(mixed $value): self
     {
@@ -66,12 +83,14 @@ public static function value(mixed $value): self
 
     /**
      * Get value string length
-     * @param  string $value
+     * @param string $value
      * @return int
+     * @throws ErrorException
      */
     public function getLength(string $value): int
     {
-        return strlen($value);
+        $mb = new MB($value);
+        return (int)$mb->strlen();
     }
 
     /**
@@ -181,6 +200,9 @@ public function findInString(string $match, ?int $pos = null): bool
      */
     public function phone(): bool
     {
+        if (is_null($this->getStr)) {
+            return false;
+        }
         $val = (string)$this->getStr->replace([" ", "-", "—", "–", "(", ")"], ["", "", "", "", "", ""]);
         $match = preg_match('/^[0-9]{7,14}+$/', $val);
         $strict = preg_match('/^\+[0-9]{1,2}[0-9]{6,13}$/', $val);
@@ -189,15 +211,19 @@ public function phone(): bool
 
     /**
      * Check if is valid ZIP
-     * @param  int      $arg1 start length
-     * @param  int|null $arg2 end length
+     * @param int $arg1 start length
+     * @param int|null $arg2 end length
      * @return bool
+     * @throws ErrorException
      */
     public function zip(int $arg1, int $arg2 = null): bool
     {
+        if (is_null($this->getStr)) {
+            return false;
+        }
         $this->value = (string)$this->getStr->replace([" ", "-", "—", "–"], ["", "", "", ""]);
         $this->length = $this->getLength($this->value);
-        return ($this->int() && $this->length($arg1, $arg2));
+        return ($this->isInt() && $this->length($arg1, $arg2));
     }
 
     /**
@@ -210,12 +236,6 @@ public function isFloat(): bool
         return (filter_var($this->value, FILTER_VALIDATE_FLOAT) !== false);
     }
 
-    // Deprecated
-    public function float(): bool
-    {
-        return $this->isFloat();
-    }
-
     /**
      * Is value int
      * Will validate whether a string is a valid integer (User input is always a string)
@@ -226,12 +246,6 @@ public function isInt(): bool
         return (filter_var($this->value, FILTER_VALIDATE_INT) !== false);
     }
 
-    // Deprecated
-    public function int(): bool
-    {
-        return $this->isInt();
-    }
-
     /**
      * Is value string
      * @return bool
@@ -241,8 +255,11 @@ public function isString(): bool
         return is_string($this->value);
     }
 
-    // Deprecated
-    public function string(): bool
+    /**
+     * Is value string
+     * @return bool
+     */
+    public function isStr(): bool
     {
         return $this->isString();
     }
@@ -256,12 +273,6 @@ public function isArray(): bool
         return is_array($this->value);
     }
 
-    // Deprecated
-    public function array(): bool
-    {
-        return $this->isArray();
-    }
-
     /**
      * Is value object
      * @return bool
@@ -271,12 +282,6 @@ public function isObject(): bool
         return is_object($this->value);
     }
 
-    // Deprecated
-    public function object(): bool
-    {
-        return $this->isObject();
-    }
-
     /**
      * Is value bool
      * @return bool
@@ -286,12 +291,6 @@ public function isBool(): bool
         return (is_bool($this->value));
     }
 
-    // Deprecated
-    public function bool(): bool
-    {
-        return $this->isBool();
-    }
-
     /**
      * Check if the value itself can be Interpreted as a bool value
      * E.g. If value === ([on, off], [yes, no], [1, 0] or [true, false])
@@ -305,10 +304,58 @@ public function isBoolVal(): bool
         return ($true || $false);
     }
 
-    // Deprecated
-    public function boolVal(): bool
+    /**
+     * Is null
+     * @return bool
+     */
+    public function isNull(): bool
+    {
+        return is_null($this->value);
+    }
+
+    /**
+     * Is file
+     * @return bool
+     */
+    public function isFile(): bool
+    {
+        return is_file($this->value);
+    }
+
+    /**
+     * Is directory
+     * @return bool
+     */
+    public function isDir(): bool
+    {
+        return is_dir($this->value);
+    }
+
+    /**
+     * Is resource
+     * @return bool
+     */
+    public function isResource(): bool
+    {
+        return is_resource($this->value);
+    }
+
+    /**
+     * Is writable
+     * @return bool
+     */
+    public function isWritable(): bool
+    {
+        return is_writable($this->value);
+    }
+
+    /**
+     * Is readable
+     * @return bool
+     */
+    public function isReadable(): bool
     {
-        return $this->isBoolVal();
+        return is_readable($this->value);
     }
 
     /**
@@ -440,7 +487,7 @@ public function validVersion(bool $strict = false): bool
     /**
      * Validate/compare if a version is equal/more/equalMore/less... e.g than withVersion
      * @param string $withVersion
-     * @param string $operator '!='|'<'|'<='|'<>'|'='|'=='|'>'|'>='|'eq'|'ge'|'gt'|'le'|'lt'|'ne'
+     * @param '!='|'<'|'<='|'<>'|'='|'=='|'>'|'>='|'eq'|'ge'|'gt'|'le'|'lt'|'ne' $operator
      * @return bool
      */
     public function versionCompare(string $withVersion, string $operator = "=="): bool
@@ -586,10 +633,10 @@ public function dateRange(string $format = "Y-m-d H:i"): array|false
      */
     public function age(int $arg1): bool
     {
-        $now = $this->dateTime->format("Y");
+        $now = (int)$this->dateTime->format("Y");
         $dateTime = new DateTime($this->value);
-        $birth = $dateTime->format("Y");
-        $age = (int)($now - $birth);
+        $birth = (int)$dateTime->format("Y");
+        $age = ($now - $birth);
         return ($age <= $arg1);
     }
 
@@ -664,8 +711,9 @@ private function getHost(string $host): string
 
     /**
      * Validate multiple. Will return true if "one" matches
-     * @param  array $arr
+     * @param array $arr
      * @return bool
+     * @throws ErrorException
      */
     public function oneOf(array $arr): bool
     {
@@ -681,8 +729,9 @@ public function oneOf(array $arr): bool
 
     /**
      * Validate multiple. Will return true if "all" matches
-     * @param  array $arr
+     * @param array $arr
      * @return bool
+     * @throws ErrorException
      */
     public function allOf(array $arr): bool
     {

Luhn.php

@@ -14,9 +14,9 @@
 class Luhn
 {
     private $number;
-    private $length;
     private $string;
     private $part;
+    //private $length;
 
     /**
      * Start intsance and input Value
@@ -27,7 +27,7 @@ public function __construct($number)
 
         $this->string = preg_replace('/[^A-Z\d]/', '', strtoupper($number));
         $this->number = preg_replace('/\D/', '', $number);
-        $this->length = (is_string($this->number)) ? strlen($this->number) : 0;
+        //$this->length = (is_string($this->number)) ? strlen($this->number) : 0;
     }
 
     /**
@@ -215,11 +215,11 @@ final protected function luhn($number): float
      */
     final protected function part()
     {
-        $match = array();
+        $match = [];
         $reg = '/^(\d{2}){0,1}(\d{2})(\d{2})(\d{2})([\+\-\s]?)(\d{3})(\d)$/';
         preg_match($reg, $this->number, $match);
         if (count($match) !== 8) {
-            return array();
+            return [];
         }
 
         $century = $match[1];
@@ -230,7 +230,7 @@ final protected function part()
         $num     = $match[6];
         $check   = $match[7];
 
-        if (!in_array($sep, array('-', '+'))) {
+        if (!in_array($sep, ['-', '+'])) {
             if (empty($century) || date('Y') - intval(strval($century) . strval($year)) < 100) {
                 $sep = '-';
             } else {
@@ -246,15 +246,15 @@ final protected function part()
             $century = substr((string)($baseYear - (($baseYear - $year) % 100)), 0, 2);
         }
 
-        return array(
+        return [
             'century' => $century,
             'year' => $year,
             'month' => $month,
             'day' => $day,
             'sep' => $sep,
             'num' => $num,
             'check' => $check
-        );
+        ];
     }
 
     /**