Skip to content

Commit

Permalink
remove type hint so it can be used with normal query builders
Browse files Browse the repository at this point in the history
  • Loading branch information
esbenp committed Oct 17, 2021
1 parent ddb07e0 commit dfab464
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions src/EloquentBuilderTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use InvalidArgumentException;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Str;

trait EloquentBuilderTrait
{
/**
* Apply resource options to a query builder
* @param Builder $queryBuilder
* @param $queryBuilder
* @param array $options
* @return Builder
*/
protected function applyResourceOptions(Builder $queryBuilder, array $options = [])
protected function applyResourceOptions($queryBuilder, array $options = [])
{
if (empty($options)) {
return $queryBuilder;
Expand Down Expand Up @@ -71,12 +70,12 @@ protected function applyResourceOptions(Builder $queryBuilder, array $options =
}

/**
* @param Builder $queryBuilder
* @param $queryBuilder
* @param array $filterGroups
* @param array $previouslyJoined
* @return array
*/
protected function applyFilterGroups(Builder $queryBuilder, array $filterGroups = [], array $previouslyJoined = [])
protected function applyFilterGroups($queryBuilder, array $filterGroups = [], array $previouslyJoined = [])
{
$joins = [];
foreach ($filterGroups as $group) {
Expand All @@ -98,12 +97,12 @@ protected function applyFilterGroups(Builder $queryBuilder, array $filterGroups
}

/**
* @param Builder $queryBuilder
* @param $queryBuilder
* @param array $filter
* @param bool|false $or
* @param array $joins
*/
protected function applyFilter(Builder $queryBuilder, array $filter, $or = false, array &$joins)
protected function applyFilter($queryBuilder, array $filter, $or = false, array &$joins)
{
// Destructure Shorthand Filtering Syntax if filter is Shorthand
if (! array_key_exists('key', $filter) && count($filter) >= 3) {
Expand Down Expand Up @@ -216,12 +215,12 @@ protected function applyFilter(Builder $queryBuilder, array $filter, $or = false
}

/**
* @param Builder $queryBuilder
* @param $queryBuilder
* @param array $sorting
* @param array $previouslyJoined
* @return array
*/
protected function applySorting(Builder $queryBuilder, array $sorting, array $previouslyJoined = [])
protected function applySorting($queryBuilder, array $sorting, array $previouslyJoined = [])
{
$joins = [];
foreach($sorting as $sortRule) {
Expand Down Expand Up @@ -266,10 +265,10 @@ private function hasCustomMethod($type, $key)
}

/**
* @param Builder $queryBuilder
* @param $queryBuilder
* @param $key
*/
private function joinRelatedModelIfExists(Builder $queryBuilder, $key)
private function joinRelatedModelIfExists($queryBuilder, $key)
{
$model = $queryBuilder->getModel();

Expand Down

0 comments on commit dfab464

Please sign in to comment.