Merge pull request #10 from MaplePHP/develop

Add more validations and patch for null args

Author: wazabii8

Inp.php

@@ -215,7 +215,7 @@ public function phone(): bool
      * @return bool
      * @throws ErrorException
      */
-    public function zip(int $arg1, int $arg2 = null): bool
+    public function zip(int $arg1, ?int $arg2 = null): bool
     {
         if (is_null($this->getStr)) {
             return false;
@@ -290,6 +290,37 @@ public function isBool(): bool
         return (is_bool($this->value));
     }
 
+    /**
+     * Is a valid json string
+     * @return bool
+     */
+    public function isJson(): bool
+    {
+        json_decode($this->value);
+        return json_last_error() === JSON_ERROR_NONE;
+    }
+
+    /**
+     * Validate a string as html, check that it contains doctype, html, head and body
+     * @return bool
+     */
+    public function isFullHtml(): bool
+    {
+        libxml_use_internal_errors(true);
+        $dom = new \DOMDocument();
+        if (!is_string($this->value) || !$dom->loadHTML($this->value, LIBXML_NOERROR | LIBXML_NOWARNING)) {
+            return false; // Invalid HTML syntax
+        }
+        if (!$dom->doctype || strtolower($dom->doctype->name) !== "html") {
+            return false;
+        }
+        $htmlTag = $dom->getElementsByTagName("html")->length > 0;
+        $headTag = $dom->getElementsByTagName("head")->length > 0;
+        $bodyTag = $dom->getElementsByTagName("body")->length > 0;
+        return $htmlTag && $headTag && $bodyTag;
+    }
+
+
     /**
      * 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])
@@ -430,7 +461,7 @@ public function max(float $int): bool
      * @param  int|null $arg2 end length
      * @return bool
      */
-    public function length(int $arg1, int $arg2 = null): bool
+    public function length(int $arg1, ?int $arg2 = null): bool
     {
         if ($this->length >= $arg1 && (($arg2 === null) || $this->length <= $arg2)) {
             return true;
@@ -636,7 +667,7 @@ public function age(int $arg1): bool
         $dateTime = new DateTime($this->value);
         $birth = (int)$dateTime->format("Y");
         $age = ($now - $birth);
-        return ($age <= $arg1);
+        return ($age >= $arg1);
     }
 
     /**

README.md

@@ -230,6 +230,18 @@ Inp::value($obj)->isObject();
 Inp::value($resource)->isResource();
 ```
 
+- **Json**:
+```php
+Inp::value($jsonStr)->isJson();
+```
+
+- **HTML Document**:
+```php
+Inp::value($jsonStr)->isFullHtml();
+```
+
+
+
 ### Validate if value is boolean or interpretable as a boolean
 - **Is Boolean**:
 ```php

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "maplephp/validate",
   "type": "library",
-  "version": "v1.0.8",
+  "version": "v1.1.0",
   "description": "User-friendly input validation library.",
   "keywords": [
     "validation",

tests/unitary-validate-inp.php

@@ -141,7 +141,7 @@
         "equal" => [true],
     ], "Expect date to be true");
 
-    $this->add(Inp::value("1988-08-21")->age(36), [
+    $this->add(Inp::value("1988-08-21")->age(18), [
         "equal" => [true],
     ], "Expect age to be true");