generic refactor

src/modules/generics/aliases/T.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Sagittaracc\PhpPythonDecorator\modules\generics\aliases;
+
+use Attribute;
+use Sagittaracc\PhpPythonDecorator\modules\generics\core\Generic;
+
+#[Attribute]
+class T extends Generic
+{}

src/modules/generics/aliases/U.php

@@ -3,8 +3,8 @@
 namespace Sagittaracc\PhpPythonDecorator\modules\generics\aliases;
 
 use Attribute;
-use Sagittaracc\PhpPythonDecorator\modules\generics\core\T;
+use Sagittaracc\PhpPythonDecorator\modules\generics\core\Generic;
 
 #[Attribute]
-class U extends T
+class U extends Generic
 {}

src/modules/generics/core/Generic.php

@@ -2,7 +2,65 @@
 
 namespace Sagittaracc\PhpPythonDecorator\modules\generics\core;
 
+use Sagittaracc\PhpPythonDecorator\exceptions\GenericError;
+use Sagittaracc\PhpPythonDecorator\exceptions\module\NotFoundModuleError;
+use Sagittaracc\PhpPythonDecorator\modules\generics\Generics;
+use Sagittaracc\PhpPythonDecorator\modules\validation\Validation;
 use Sagittaracc\PhpPythonDecorator\PythonDecorator;
 
-abstract class Generic extends PythonDecorator implements GenericInterface
-{}
+class Generic extends PythonDecorator
+{
+    protected function getEntityByValue($value)
+    {
+        $module = $this->getObject()->scope['modules'][Generics::class];
+        $entityIndex = array_search($value, $module['generics']);
+        $entity = $module['entities'][$entityIndex];
+
+        return $entity;
+    }
+
+    protected function checkGeneric($value)
+    {
+        $entity = $this->getEntityByValue(static::class);
+
+        if (in_array($entity, Validation::$primitives)) {
+            if ((new $entity)->validation($value)) {
+                return true;
+            }
+            else {
+                throw new GenericError();
+            }
+        }
+
+        if ($value instanceof $entity) {
+            return true;
+        }
+
+        throw new GenericError;
+    }
+
+    protected function registerGeneric($object, &$module)
+    {
+        if (!is_object($object)) {
+            return false;
+        }
+
+        try {
+            $module = Generics::getInstanceFrom($object);
+        }
+        catch (NotFoundModuleError $e) {
+            return false;
+        }
+
+        $module->addName(static::class);
+
+        return true;
+    }
+
+    public function wrapper(mixed $object_or_value)
+    {
+        $this->registerGeneric($object_or_value, $module) || $this->checkGeneric($object_or_value);
+
+        return fn(...$args) => $module->addEntities($args);
+    }
+}

src/modules/generics/core/GenericList.php

@@ -24,7 +24,7 @@ public function wrapper(mixed $object)
             $generic = new $genericClass;
 
             if (!($generic instanceof Generic)) {
-                throw new GenericError('', 400);
+                throw new GenericError;
             }
 
             $generic->wrapper($object);

tests/GenericsTest.php

@@ -4,8 +4,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Sagittaracc\PhpPythonDecorator\exceptions\GenericError;
+use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\T;
 use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\U;
-use Sagittaracc\PhpPythonDecorator\modules\generics\core\T;
 use Sagittaracc\PhpPythonDecorator\modules\generics\Generics;
 use Sagittaracc\PhpPythonDecorator\modules\validation\primitives\Number;
 use Sagittaracc\PhpPythonDecorator\modules\validation\primitives\Str;

tests/examples/Box.php

@@ -3,7 +3,7 @@
 namespace Sagittaracc\PhpPythonDecorator\tests\examples;
 
 use Sagittaracc\PhpPythonDecorator\Decorator;
-use Sagittaracc\PhpPythonDecorator\modules\generics\core\T;
+use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\T;
 use Sagittaracc\PhpPythonDecorator\modules\validation\primitives\Str;
 use Sagittaracc\PhpPythonDecorator\modules\validation\validators\ArrayOf;
 use Sagittaracc\PhpPythonDecorator\modules\validation\validators\Length;

tests/examples/MyAnotherBox.php

@@ -3,9 +3,9 @@
 namespace Sagittaracc\PhpPythonDecorator\tests\examples;
 
 use Sagittaracc\PhpPythonDecorator\Decorator;
+use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\T;
 use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\U;
 use Sagittaracc\PhpPythonDecorator\modules\generics\core\GenericList;
-use Sagittaracc\PhpPythonDecorator\modules\generics\core\T;
 
 #[GenericList(T::class, U::class)]
 class MyAnotherBox

tests/examples/PaymentInfo.php

@@ -3,7 +3,7 @@
 namespace Sagittaracc\PhpPythonDecorator\tests\examples;
 
 use Sagittaracc\PhpPythonDecorator\Decorator;
-use Sagittaracc\PhpPythonDecorator\modules\generics\core\T;
+use Sagittaracc\PhpPythonDecorator\modules\generics\aliases\T;
 
 #[T]
 class PaymentInfo