Skip to content

Commit 3f9566b

Browse files
Apply fixes from StyleCI (#374)
Co-authored-by: StyleCI Bot <bot@styleci.io>
1 parent 073688a commit 3f9566b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/Http/Livewire/LivewireDatatable.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
namespace Mediconesystems\LivewireDatatables\Http\Livewire;
44

55
use Exception;
6-
use Illuminate\Database\Eloquent\Relations\BelongsTo;
76
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
87
use Illuminate\Database\Eloquent\Relations\HasMany;
98
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
10-
use Illuminate\Database\Eloquent\Relations\HasOne;
11-
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
129
use Illuminate\Database\Query\Expression;
1310
use Illuminate\Support\Arr;
1411
use Illuminate\Support\Facades\DB;
@@ -313,7 +310,6 @@ public function getProcessedColumnsProperty()
313310
->sort($this->sort);
314311
}
315312

316-
317313
public function resolveAdditionalSelects($column)
318314
{
319315
$selects = collect($column->additionalSelects)->map(function ($select) use ($column) {
@@ -417,6 +413,7 @@ protected function resolveColumnName($column, $additional = null)
417413

418414
if ($relatedQuery->getRelation($relation) instanceof HasMany || $relatedQuery->getRelation($relation) instanceof HasManyThrough || $relatedQuery->getRelation($relation) instanceof BelongsToMany) {
419415
$this->query->customWithAggregate($aggregateName, $column->aggregate ?? 'count', $columnName, $column->name);
416+
420417
return null;
421418
}
422419

tests/TestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace Mediconesystems\LivewireDatatables\Tests;
44

5-
use Illuminate\Support\Str;
65
use Illuminate\Support\Facades\View;
6+
use Illuminate\Support\Str;
77
use Livewire\LivewireServiceProvider;
88
use Maatwebsite\Excel\ExcelServiceProvider;
9+
use Mediconesystems\LivewireDatatables\LivewireDatatablesServiceProvider;
910
use Orchestra\Testbench\TestCase as Orchestra;
1011
use Reedware\LaravelRelationJoins\LaravelRelationJoinServiceProvider;
11-
use Mediconesystems\LivewireDatatables\LivewireDatatablesServiceProvider;
1212

1313
class TestCase extends Orchestra
1414
{

0 commit comments

Comments
 (0)