Propagated request $data into request->schema() method

strategio-digital · May 2, 2024 · c0d4324 · c0d4324
1 parent f8a58dd
commit c0d4324
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 17 deletions.
diff --git a/src/Http/Request/Admin/ProfileRequest.php b/src/Http/Request/Admin/ProfileRequest.php
@@ -14,7 +14,7 @@ public function __construct(protected readonly EntityManager $em, protected read
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [];
     }

diff --git a/src/Http/Request/Admin/UploadAvatarRequest.php b/src/Http/Request/Admin/UploadAvatarRequest.php
@@ -16,7 +16,7 @@ public function __construct(protected readonly AuthUser $user, protected readonl
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return ['avatar' => Expect::type(UploadedFile::class)->required()];
     }

diff --git a/src/Http/Request/Auth/EmailAuthRequest.php b/src/Http/Request/Auth/EmailAuthRequest.php
@@ -27,7 +27,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $all = $this->entityFinder->findAll();
         $filtered = array_filter($all, fn($item) => is_subclass_of($item['className'], IAuthenticable::class));

diff --git a/src/Http/Request/Auth/RevokeTokenRequest.php b/src/Http/Request/Auth/RevokeTokenRequest.php
@@ -19,7 +19,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $all = $this->entityFinder->findAll();
         $filtered = array_filter($all, fn($item) => is_subclass_of($item['className'], IAuthenticable::class));

diff --git a/src/Http/Request/Collection/CreateRequest.php b/src/Http/Request/Collection/CreateRequest.php
@@ -32,7 +32,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/Collection/DeleteRequest.php b/src/Http/Request/Collection/DeleteRequest.php
@@ -26,7 +26,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/Collection/Form/CreatingFormRequest.php b/src/Http/Request/Collection/Form/CreatingFormRequest.php
@@ -23,7 +23,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/Collection/Form/UpdatingFormRequest.php b/src/Http/Request/Collection/Form/UpdatingFormRequest.php
@@ -29,7 +29,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/Collection/NavbarRequest.php b/src/Http/Request/Collection/NavbarRequest.php
@@ -19,7 +19,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [];
     }

diff --git a/src/Http/Request/Collection/ReadRequest.php b/src/Http/Request/Collection/ReadRequest.php
@@ -31,7 +31,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/Collection/UpdateRequest.php b/src/Http/Request/Collection/UpdateRequest.php
@@ -33,7 +33,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         $recipeKeys = array_map(fn($r) => $r->key(), $this->recipeFinder->load()->getAll());
 

diff --git a/src/Http/Request/IRequest.php b/src/Http/Request/IRequest.php
@@ -8,9 +8,10 @@
 interface IRequest
 {
     /**
+     * @param array<string|int, mixed> $data
      * @return array<string|int, mixed>
      */
-    public function schema(): array;
+    public function schema(array $data): array;
 
     /**
      * @param array<string|int, mixed> $data

diff --git a/src/Http/Request/Request.php b/src/Http/Request/Request.php
@@ -45,7 +45,7 @@ public function __invoke(SymfonyRequest $request): Response
         $this->request = $request;
 
         $data = $this->getRequestData();
-        $schema = $this->schema();
+        $schema = $this->schema($data);
 
         if (count($schema) !== 0) {
             try {

diff --git a/src/Http/Request/Resource/CreateRoleRequest.php b/src/Http/Request/Resource/CreateRoleRequest.php
@@ -16,7 +16,7 @@ public function __construct(protected EntityManager $em)
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [
             'name' => Expect::string()->min(3)->max(32)->required(),

diff --git a/src/Http/Request/Resource/DeleteRoleRequest.php b/src/Http/Request/Resource/DeleteRoleRequest.php
@@ -15,7 +15,7 @@ public function __construct(protected EntityManager $em)
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [
             'id' => Expect::string()->required(),

diff --git a/src/Http/Request/Resource/ReadAllRequest.php b/src/Http/Request/Resource/ReadAllRequest.php
@@ -23,7 +23,7 @@ public function __construct(
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [
             'view_resources' => Expect::arrayOf('string')->required(),

diff --git a/src/Http/Request/Resource/UpdateRoleRequest.php b/src/Http/Request/Resource/UpdateRoleRequest.php
@@ -16,7 +16,7 @@ public function __construct(protected EntityManager $em)
     {
     }
 
-    public function schema(): array
+    public function schema(array $data): array
     {
         return [
             'resource_id' => Expect::string()->required(),
-Original file line number
+Diff line change
@@ Expand Up @@
         {
         }
-        public function schema(): array
+        public function schema(array $data): array
         {
             return [];
         }
@@ Expand Down @@