Thor Extractor Refactored

cesurapp · Mar 20, 2024 · b0e200a · b0e200a
1 parent b84658a
commit b0e200a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/AbstractClass/ApiController.php b/src/AbstractClass/ApiController.php
@@ -89,7 +89,7 @@ protected function isGranted(mixed $attribute, mixed $subject = null): bool
     protected function isGrantedDeny(mixed $attribute, mixed $subject = null): void
     {
         if (!$this->isGranted($attribute, $subject)) {
-            throw new AccessDeniedHttpException();
+            throw new AccessDeniedHttpException('Access Denied.');
         }
     }
 

diff --git a/src/Thor/Attribute/ThorResource.php b/src/Thor/Attribute/ThorResource.php
@@ -8,7 +8,8 @@
 #[\Attribute(\Attribute::TARGET_FUNCTION | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
 final class ThorResource
 {
-    public function __construct(protected array $data = [])
+    // @phpstan-ignore-next-line
+    public function __construct(protected array $data = [], callable|string $callback = null)
     {
     }
 }
diff --git a/src/Thor/Extractor/ExtractDto.php b/src/Thor/Extractor/ExtractDto.php
@@ -221,9 +221,20 @@ private function extractDTOClass(\ReflectionClass $class): array
 
             // Api Resource
             $apiResource = $property->getAttributes(ThorResource::class);
-            if (str_contains($types, 'array') && count($apiResource)) {
-                $r = $apiResource[0]->getArguments()['data'];
-                $parameters[$property->getName()] = $r;
+            if (count($apiResource)) {
+                $r = $apiResource[0]->getArguments();
+
+                if (isset($r['callback'])) {
+                    $data = call_user_func($r['callback']);
+                    $parameters[$property->getName()] = implode('|', array_map(static fn ($v) => '?'.$v, $data));
+                } else {
+                    if (!array_is_list($r['data'])) {
+                        $parameters[$property->getName()] = $r['data'];
+                    } else {
+                        $parameters[$property->getName()] = implode('|', array_map(static fn ($v) => '?'.$v, $r['data']));
+                    }
+                }
+
                 continue;
             }