diff --git a/composer.json b/composer.json index 47dfc77..a134e24 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ } }, "require": { - "laravel/framework": "~6.0|~7.0|~8.0", + "laravel/framework": "~6.0|~7.0|~8.0|~9.0", "optimus/architect": "~2.0" }, "require-dev": { diff --git a/src/EloquentBuilderTrait.php b/src/EloquentBuilderTrait.php index 4bc5a6f..195a3fd 100644 --- a/src/EloquentBuilderTrait.php +++ b/src/EloquentBuilderTrait.php @@ -105,7 +105,7 @@ protected function applyFilterGroups($queryBuilder, array $filterGroups = [], ar * @param bool|false $or * @param array $joins */ - protected function applyFilter($queryBuilder, array $filter, $or = false, array &$joins) + protected function applyFilter($queryBuilder, array $filter, $or, array &$joins) { // Destructure Shorthand Filtering Syntax if filter is Shorthand if (! array_key_exists('key', $filter) && count($filter) >= 3) { diff --git a/src/LaravelController.php b/src/LaravelController.php index 8b355b2..e4cab1c 100644 --- a/src/LaravelController.php +++ b/src/LaravelController.php @@ -125,9 +125,9 @@ protected function parseFilterGroups(array $filter_groups) $or = false; if (array_key_exists('or', $group)) { if ($group['or'] === 'true') { - $group['or'] = true; + $or = true; } else if ($group['or'] === 'false') { - $group['or'] = false; + $or = false; } }