diff --git a/src/Filters/AdvancedFiltersCollection.php b/src/Filters/AdvancedFiltersCollection.php index 46782de8b..12036957d 100644 --- a/src/Filters/AdvancedFiltersCollection.php +++ b/src/Filters/AdvancedFiltersCollection.php @@ -20,7 +20,7 @@ public function apply(RestifyRequest $request, $query): self public static function collectQueryFilters(RestifyRequest $request, Repository $repository): self { - $filters = json_decode(base64_decode($request->query('filters')), true); + $filters = json_decode(base64_decode($request->input('filters')), true); $allowedFilters = $repository->collectAdvancedFilters($request); diff --git a/src/Repositories/ValidatingTrait.php b/src/Repositories/ValidatingTrait.php index 7dd44e91a..b63a504da 100644 --- a/src/Repositories/ValidatingTrait.php +++ b/src/Repositories/ValidatingTrait.php @@ -44,9 +44,9 @@ public static function validatorForStoring(RestifyRequest $request, array $plain $on->getStoringRules($request), $messages )->after(function ($validator) use ($request) { - static::afterValidation($request, $validator); - static::afterStoringValidation($request, $validator); - }); + static::afterValidation($request, $validator); + static::afterStoringValidation($request, $validator); + }); } public static function validatorForStoringBulk(RestifyRequest $request, array $plainPayload = null) @@ -67,9 +67,9 @@ public static function validatorForStoringBulk(RestifyRequest $request, array $p $on->getStoringBulkRules($request), $messages )->after(function ($validator) use ($request) { - static::afterValidation($request, $validator); - static::afterStoringBulkValidation($request, $validator); - }); + static::afterValidation($request, $validator); + static::afterStoringBulkValidation($request, $validator); + }); } /** @@ -101,9 +101,9 @@ public static function validatorForUpdate(RestifyRequest $request, $resource = n $on->getUpdatingRules($request), $messages )->after(function ($validator) use ($request) { - static::afterValidation($request, $validator); - static::afterUpdatingValidation($request, $validator); - }); + static::afterValidation($request, $validator); + static::afterUpdatingValidation($request, $validator); + }); } public static function validatorForPatch(RestifyRequest $request, $resource = null, array $plainPayload = null) @@ -127,9 +127,9 @@ public static function validatorForPatch(RestifyRequest $request, $resource = nu collect($on->getUpdatingRules($request))->intersectByKeys($request->json())->all(), $messages )->after(function ($validator) use ($request) { - static::afterValidation($request, $validator); - static::afterUpdatingValidation($request, $validator); - }); + static::afterValidation($request, $validator); + static::afterUpdatingValidation($request, $validator); + }); } public static function validatorForAttach(RestifyRequest $request, $resource = null, array $plainPayload = null) @@ -179,9 +179,9 @@ public static function validatorForUpdateBulk(RestifyRequest $request, $resource $on->getUpdatingBulkRules($request), $messages )->after(function ($validator) use ($request) { - static::afterValidation($request, $validator); - static::afterUpdatingBulkValidation($request, $validator); - }); + static::afterValidation($request, $validator); + static::afterUpdatingBulkValidation($request, $validator); + }); } /**