fix: resolving request input when "use_validated" config option is set to "true"

Author: alexzarbn

src/Concerns/HandlesRelationManyToManyOperations.php

@@ -54,9 +54,7 @@ protected function attachWithTransaction(Request $request, $parentKey)
         $attachResult = $this->performAttach(
             $request,
             $parentEntity,
-            config('orion.use_validated')
-                ? $request->validated('resources')
-                : $request->get('resources'),
+            $this->retrieve($request, 'resources'),
             $request->get('duplicates', false)
         );
 
@@ -276,9 +274,7 @@ protected function detachWithTransaction(Request $request, $parentKey)
         $detachResult = $this->performDetach(
             $request,
             $parentEntity,
-            config('orion.use_validated')
-                ? $request->validated('resources')
-                : $request->get('resources')
+            $this->retrieve($request, 'resources')
         );
 
         $afterHookResult = $this->afterDetach($request, $parentEntity, $detachResult);
@@ -401,9 +397,7 @@ protected function syncWithTransaction(Request $request, $parentKey)
         $syncResult = $this->performSync(
             $request,
             $parentEntity,
-            config('orion.use_validated')
-                ? $request->validated('resources')
-                : $request->get('resources'),
+            $this->retrieve($request, 'resources'),
             $request->get('detaching', true)
         );
 
@@ -529,9 +523,7 @@ protected function toggleWithTransaction(Request $request, $parentKey)
         $toggleResult = $this->performToggle(
             $request,
             $parentEntity,
-            config('orion.use_validated')
-                ? $request->validated('resources')
-                : $request->get('resources')
+            $this->retrieve($request, 'resources')
         );
 
         $afterHookResult = $this->afterToggle($request, $parentEntity, $toggleResult);

src/Concerns/HandlesRelationStandardBatchOperations.php

@@ -53,9 +53,7 @@ protected function batchStoreWithTransaction(Request $request, $parentKey)
             return $beforeHookResult;
         }
 
-        $resources = config('orion.use_validated')
-            ? $request->validated('resources', [])
-            : $request->get('resources', []);
+        $resources = $this->retrieve($request, 'resources', []);
         $entities = collect([]);
 
         $requestedRelations = $this->relationsResolver->requestedRelations($request);
@@ -204,9 +202,7 @@ protected function batchUpdateWithTransaction(Request $request, $parentKey)
             /** @var Model $entity */
             $this->authorize($this->resolveAbility('update'), [$entity, $parentEntity]);
 
-            $resource = config('orion.use_validated')
-                ? $request->validated("resources.{$entity->{$this->keyName()}}")
-                : $request->input("resources.{$entity->{$this->keyName()}}");
+            $resource = $this->retrieve($request, "resources.{$entity->{$this->keyName()}}");
 
             $this->beforeUpdate($request, $parentEntity, $entity);
             $this->beforeSave($request, $parentEntity, $entity);

src/Concerns/HandlesRelationStandardOperations.php

@@ -305,9 +305,7 @@ protected function storeWithTransaction(Request $request, $parentKey)
             $request,
             $parentEntity,
             $entity,
-            config('orion.use_validated')
-                ? $request->validated()
-                : $request->all(),
+            $this->retrieve($request),
             $request->get('pivot', [])
         );
 
@@ -713,9 +711,7 @@ protected function updateWithTransaction(Request $request, $parentKey, $relatedK
             $request,
             $parentEntity,
             $entity,
-            config('orion.use_validated')
-                ? $request->validated()
-                : $request->all(),
+            $this->retrieve($request),
             $request->get('pivot', [])
         );
 

src/Concerns/HandlesStandardBatchOperations.php

@@ -46,9 +46,7 @@ protected function batchStoreWithTransaction(Request $request)
 
         $this->authorize($this->resolveAbility('create'), $resourceModelClass);
 
-        $resources = config('orion.use_validated')
-            ? $request->validated('resources', [])
-            : $request->get('resources', []);
+        $resources = $this->retrieve($request, 'resources', []);
         $entities = collect([]);
 
         $requestedRelations = $this->relationsResolver->requestedRelations($request);
@@ -156,9 +154,7 @@ protected function batchUpdateWithTransaction(Request $request)
             $this->performUpdate(
                 $request,
                 $entity,
-                config('orion.use_validated')
-                    ? $request->validated("resources.{$entity->{$this->keyName()}}")
-                    : $request->input("resources.{$entity->{$this->keyName()}}")
+                $this->retrieve($request, "resources.{$entity->{$this->keyName()}}")
             );
 
             $this->beforeUpdateFresh($request, $entity);

src/Concerns/HandlesStandardOperations.php

@@ -198,9 +198,7 @@ protected function storeWithTransaction(Request $request)
         $this->performStore(
             $request,
             $entity,
-            config('orion.use_validated')
-                ? $request->validated()
-                : $request->all()
+            $this->retrieve($request)
         );
 
         $beforeStoreFreshResult = $this->beforeStoreFresh($request, $entity);
@@ -485,9 +483,7 @@ protected function updateWithTransaction(Request $request, $key)
         $this->performUpdate(
             $request,
             $entity,
-            config('orion.use_validated')
-                ? $request->validated()
-                : $request->all()
+            $this->retrieve($request)
         );
 
         $beforeUpdateFreshResult = $this->beforeUpdateFresh($request, $entity);

src/Http/Controllers/BaseController.php

@@ -10,6 +10,7 @@
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Orion\Concerns\BuildsResponses;
@@ -626,4 +627,25 @@ protected function shouldPaginate(Request $request, int $paginationLimit): bool
 
         return !property_exists($this, 'paginationDisabled');
     }
+
+    /**
+     * Retrieves data from the request
+     *
+     * @param Request $request
+     * @param string|null $key
+     * @param null $default
+     * @return mixed
+     */
+    protected function retrieve(Request $request, ?string $key = null, $default = null)
+    {
+        if (!config('orion.use_validated')) {
+            return $key ? $request->get($key, $default) : $request->all();
+        }
+
+        if (!$key) {
+            return $request->validated();
+        }
+
+        return Arr::get($request->safe([$key]), $key, $default);
+    }
 }

tests/Feature/Relations/BelongsTo/BelongsToRelationStandardUpdateOperationsTest.php

@@ -3,8 +3,6 @@
 namespace Orion\Tests\Feature\Relations\BelongsTo;
 
 use Illuminate\Support\Facades\Gate;
-use Mockery;
-use Orion\Contracts\ComponentsResolver;
 use Orion\Tests\Feature\TestCase;
 use Orion\Tests\Fixtures\App\Http\Requests\UserRequest;
 use Orion\Tests\Fixtures\App\Http\Resources\SampleResource;

tests/Feature/Relations/BelongsToMany/BelongsToManyRelationManyToManyOperationsTest.php

@@ -754,4 +754,4 @@ public function updating_pivot_of_relation_resource_casted_to_json_pivot_field()
             ['references' => ['key' => 'value']]
         );
     }
-}
+}