refactor validation

sagittaracc · Apr 19, 2024 · 09527c7 · 09527c7
1 parent b40f078
commit 09527c7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/modules/generics/core/T.php b/src/modules/generics/core/T.php
@@ -26,7 +26,7 @@ private function checkGeneric($value)
         $entity = $this->getEntityByValue(static::class);
 
         if (in_array($entity, Validation::$primitives)) {
-            if ((new $entity)->validate($value)) {
+            if ((new $entity)->validation($value)) {
                 return true;
             }
             else {

diff --git a/src/modules/validation/primitives/Boolean.php b/src/modules/validation/primitives/Boolean.php
@@ -2,9 +2,13 @@
 
 namespace Sagittaracc\PhpPythonDecorator\modules\validation\primitives;
 
-class Boolean
+use Attribute;
+use Sagittaracc\PhpPythonDecorator\modules\validation\Validator;
+
+#[Attribute]
+class Boolean extends Validator
 {
-    public function validate($value)
+    public function validation($value)
     {
         return is_bool($value);
     }

diff --git a/src/modules/validation/primitives/Number.php b/src/modules/validation/primitives/Number.php
@@ -2,9 +2,13 @@
 
 namespace Sagittaracc\PhpPythonDecorator\modules\validation\primitives;
 
-class Number
+use Attribute;
+use Sagittaracc\PhpPythonDecorator\modules\validation\Validator;
+
+#[Attribute]
+class Number extends Validator
 {
-    public function validate($value)
+    public function validation($value)
     {
         return is_int($value);
     }

diff --git a/src/modules/validation/primitives/Str.php b/src/modules/validation/primitives/Str.php
@@ -2,9 +2,13 @@
 
 namespace Sagittaracc\PhpPythonDecorator\modules\validation\primitives;
 
-class Str
+use Attribute;
+use Sagittaracc\PhpPythonDecorator\modules\validation\Validator;
+
+#[Attribute]
+class Str extends Validator
 {
-    public function validate($value)
+    public function validation($value)
     {
         return is_string($value);
     }