Add support for DTO 2

Author: wazabii8

composer.json

@@ -23,7 +23,7 @@
   ],
   "require": {
     "php": ">=8.0",
-    "maplephp/dto": "^1.0"
+    "maplephp/dto": "^2.0"
   },
   "require-dev": {
     "maplephp/unitary": "^1.0"

tests/unitary-validate-inp.php

@@ -9,184 +9,182 @@
 use MaplePHP\Validate\Inp;
 
 $unit = new Unit();
-$unit->case("MaplePHP input validate test", function($inst) {
+$unit->case("MaplePHP input validate test", function() {
 
     $strVal = Inp::value("TestStringValue");
     $testStrValidates = ["isString", "required", "hasValue"];
 
     foreach ($testStrValidates as $validate) {
-        $inst->add($strVal->{$validate}(), [
+        $this->add($strVal->{$validate}(), [
             "equal" => [true],
         ], "Expect {$validate} to be true");
     }
 
-    $inst->add(Inp::value("8808218329")->socialNumber(), [
+    $this->add(Inp::value("8808218329")->socialNumber(), [
         "equal" => [false],
     ], "Expect socialNumber to be false");
 
-    $inst->add(Inp::value("4030000010001234")->creditCard(), [
+    $this->add(Inp::value("4030000010001234")->creditCard(), [
         "equal" => [true],
     ], "Expect creditCard to be true");
 
-    $inst->add(Inp::value("john.doe-gmail.com")->email(), [
+    $this->add(Inp::value("john.doe-gmail.com")->email(), [
         "equal" => [false],
     ], "Expect creditCard to be false");
 
-    $inst->add(Inp::value("Hello world!")->findInString("world"), [
+    $this->add(Inp::value("Hello world!")->findInString("world"), [
         "equal" => [true],
     ], "Expect findInString to be true");
 
-    $inst->add(Inp::value("+46 (0) 702-83 27 12")->phone(), [
+    $this->add(Inp::value("+46 (0) 702-83 27 12")->phone(), [
         "equal" => [true],
     ], "Expect phone to be true");
 
-    $inst->add(Inp::value("252522")->zip(5), [
+    $this->add(Inp::value("252522")->zip(5), [
         "equal" => [true],
     ], "Expect zip to be true");
 
     $testDataTypeValidations = ['isString', 'isInt', 'isFloat', 'isArray', 'isObject', 'isBool'];
-    $inst->add(Inp::value("Is string")->isString(), [
+    $this->add(Inp::value("Is string")->isString(), [
         "equal" => [true],
     ], "Expect isString to be true");
 
-    $inst->add(Inp::value(true)->isInt(), [
+    $this->add(Inp::value(true)->isInt(), [
         "equal" => [true],
     ], "Expect isInt to be true");
 
-    $inst->add(Inp::value(22.12)->isFloat(), [
+    $this->add(Inp::value(22.12)->isFloat(), [
         "equal" => [true],
     ], "Expect isFloat to be true");
 
-    $inst->add(Inp::value([1, 2, 3])->isArray(), [
+    $this->add(Inp::value([1, 2, 3])->isArray(), [
         "equal" => [true],
     ], "Expect isArray to be true");
 
-    $inst->add(Inp::value(new stdClass())->isObject(), [
+    $this->add(Inp::value(new stdClass())->isObject(), [
         "equal" => [true],
     ], "Expect isObject to be true");
 
-    $inst->add(Inp::value(false)->isBool(), [
+    $this->add(Inp::value(false)->isBool(), [
         "equal" => [true],
     ], "Expect isBool to be true");
 
-    $inst->add(Inp::value("222.33")->number(), [
+    $this->add(Inp::value("222.33")->number(), [
         "equal" => [true],
     ], "Expect number to be true");
 
-    $inst->add(Inp::value(100)->positive(), [
+    $this->add(Inp::value(100)->positive(), [
         "equal" => [true],
     ], "Expect positive to be true");
 
-    $inst->add(Inp::value(-100)->negative(), [
+    $this->add(Inp::value(-100)->negative(), [
         "equal" => [true],
     ], "Expect negative to be true");
 
-    $inst->add(Inp::value(10)->min(10), [
+    $this->add(Inp::value(10)->min(10), [
         "equal" => [true],
     ], "Expect min to be true");
 
-    $inst->add(Inp::value(10)->max(10), [
+    $this->add(Inp::value(10)->max(10), [
         "equal" => [true],
     ], "Expect max to be true");
 
-    $inst->add(Inp::value("Lorem ipsum")->length(1, 11), [
+    $this->add(Inp::value("Lorem ipsum")->length(1, 11), [
         "equal" => [true],
     ], "Expect length to be true");
 
-    $inst->add(Inp::value("22222")->equalLength(5), [
+    $this->add(Inp::value("22222")->equalLength(5), [
         "equal" => [true],
     ], "Expect equalLength to be true");
 
-    $inst->add(Inp::value("hello")->equal("hello"), [
+    $this->add(Inp::value("hello")->equal("hello"), [
         "equal" => [true],
     ], "Expect equal to be true");
 
-    $inst->add(Inp::value("world")->notEqual("hello"), [
+    $this->add(Inp::value("world")->notEqual("hello"), [
         "equal" => [true],
     ], "Expect notEqual to be true");
 
-    $inst->add(Inp::value("1.2.3")->validVersion(true), [
+    $this->add(Inp::value("1.2.3")->validVersion(true), [
         "equal" => [true],
     ], "Expect validVersion to be true");
 
-    $inst->add(Inp::value("1.2.0")->versionCompare("1.2.0"), [
+    $this->add(Inp::value("1.2.0")->versionCompare("1.2.0"), [
         "equal" => [true],
     ], "Expect versionCompare to be true");
 
-    $inst->add(Inp::value("MyStrongPass")->lossyPassword(), [
+    $this->add(Inp::value("MyStrongPass")->lossyPassword(), [
         "equal" => [true],
     ], "Expect lossyPassword to be true");
 
-    $inst->add(Inp::value("My@StrongPass12")->strictPassword(), [
+    $this->add(Inp::value("My@StrongPass12")->strictPassword(), [
         "equal" => [true],
     ], "Expect strictPassword to be true");
 
-    $inst->add(Inp::value("HelloWorld")->atoZ(), [
+    $this->add(Inp::value("HelloWorld")->atoZ(), [
         "equal" => [true],
     ], "Expect atoZ to be true");
 
-    $inst->add(Inp::value("welloworld")->lowerAtoZ(), [
+    $this->add(Inp::value("welloworld")->lowerAtoZ(), [
         "equal" => [true],
     ], "Expect lowerAtoZ to be true");
 
-    $inst->add(Inp::value("HELLOWORLD")->upperAtoZ(), [
+    $this->add(Inp::value("HELLOWORLD")->upperAtoZ(), [
         "equal" => [true],
     ], "Expect upperAtoZ to be true");
 
-    $inst->add(Inp::value("#F1F1F1")->hex(), [
+    $this->add(Inp::value("#F1F1F1")->hex(), [
         "equal" => [true],
     ], "Expect hex to be true");
 
-    $inst->add(Inp::value("1922-03-01")->date(), [
+    $this->add(Inp::value("1922-03-01")->date(), [
         "equal" => [true],
     ], "Expect date to be true");
 
-    $inst->add(Inp::value("1988-08-21")->age(36), [
+    $this->add(Inp::value("1988-08-21")->age(36), [
         "equal" => [true],
     ], "Expect age to be true");
 
-    $inst->add(Inp::value("example.se")->domain(), [
+    $this->add(Inp::value("example.se")->domain(), [
         "equal" => [true],
     ], "Expect domain to be true");
 
-    $inst->add(Inp::value("https://example.se")->url(), [
+    $this->add(Inp::value("https://example.se")->url(), [
         "equal" => [true],
     ], "Expect url to be true");
 
-    $inst->add(Inp::value("examplethatwillfail.se")->dns(), [
+    $this->add(Inp::value("examplethatwillfail.se")->dns(), [
         "equal" => [false],
     ], "Expect dns to be false");
 
-    $inst->add(Inp::value("Lorem ipsum")->oneOf([
+    $this->add(Inp::value("Lorem ipsum")->oneOf([
         "length" => [120, 200],
         "isString" => []
     ]), [
         "equal" => [true],
     ], "Expect oneOf to be true");
 
-    $inst->add(Inp::value("Lorem ipsum")->allOf([
+    $this->add(Inp::value("Lorem ipsum")->allOf([
         "length" => [1, 200],
         "isString" => []
     ]), [
         "equal" => [true],
     ], "Expect allOf to be true");
 
-    $inst->add(Inp::value("required")->required(), [
+    $this->add(Inp::value("required")->required(), [
         "equal" => [true],
     ], "Expect required to be true");
 
-    $inst->add(Inp::value("required")->required(), [
+    $this->add(Inp::value("required")->required(), [
         "equal" => [true],
     ], "Expect required to be true");
 
-    $inst->add(Inp::value("required")->required(), [
+    $this->add(Inp::value("required")->required(), [
         "equal" => [true],
     ], "Expect required to be true");
 
-    $inst->add(Inp::value("required")->required(), [
+    $this->add(Inp::value("required")->required(), [
         "equal" => [true],
     ], "Expect required to be true");
 
 });
-
-$unit->execute();