Skip to content

Commit

Permalink
Apply fixes from StyleCI (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexVanderbist committed Apr 12, 2019
1 parent 7809878 commit 2050228
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Concerns/AddsFieldsToQuery.php
Expand Up @@ -72,7 +72,7 @@ protected function getFieldsForRelatedTable(string $relation): array
return ColumnNameSanitizer::sanitizeArray($fields);
}

// TEMP: Below this point is sanitized
// TEMP: Below this point is sanitized

protected function getRequestedFields(): Collection
{
Expand Down
2 changes: 1 addition & 1 deletion src/Concerns/SortsQuery.php
Expand Up @@ -2,9 +2,9 @@

namespace Spatie\QueryBuilder\Concerns;

use Spatie\QueryBuilder\ColumnNameSanitizer;
use Spatie\QueryBuilder\Sort;
use Illuminate\Support\Collection;
use Spatie\QueryBuilder\ColumnNameSanitizer;
use Spatie\QueryBuilder\Exceptions\InvalidSortQuery;

trait SortsQuery
Expand Down
9 changes: 4 additions & 5 deletions tests/QueryBuilderTest.php
Expand Up @@ -2,10 +2,10 @@

namespace Spatie\QueryBuilder\Tests;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Spatie\QueryBuilder\QueryBuilder;
use Spatie\QueryBuilder\Sorts\Sort;
use Spatie\QueryBuilder\QueryBuilder;
use Illuminate\Database\Eloquent\Builder;
use Spatie\QueryBuilder\Tests\Models\TestModel;
use Spatie\QueryBuilder\Tests\Models\ScopeModel;
use Spatie\QueryBuilder\Tests\Models\SoftDeleteModel;
Expand Down Expand Up @@ -133,8 +133,7 @@ public function it_can_query_local_scopes()
/** @test */
public function it_executes_the_same_query_regardless_of_the_order_of_applied_filters_or_sorts()
{
$customSort = new class implements Sort
{
$customSort = new class implements Sort {
public function __invoke(Builder $query, $descending, string $property): Builder
{
return $query->join(
Expand All @@ -148,7 +147,7 @@ public function __invoke(Builder $query, $descending, string $property): Builder

$req = new Request([
'filter' => ['name' => 'test'],
'sort' => 'name'
'sort' => 'name',
]);

$usingSortFirst = QueryBuilder::for(TestModel::class, $req)
Expand Down

0 comments on commit 2050228

Please sign in to comment.