Skip to content

Apply fixes from StyleCI #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Apply fixes from StyleCI #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/Http/Livewire/LivewireDatatable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
namespace Mediconesystems\LivewireDatatables\Http\Livewire;

use Exception;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
use Illuminate\Database\Query\Expression;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
Expand Down Expand Up @@ -313,7 +310,6 @@ public function getProcessedColumnsProperty()
->sort($this->sort);
}


public function resolveAdditionalSelects($column)
{
$selects = collect($column->additionalSelects)->map(function ($select) use ($column) {
Expand Down Expand Up @@ -417,6 +413,7 @@ protected function resolveColumnName($column, $additional = null)

if ($relatedQuery->getRelation($relation) instanceof HasMany || $relatedQuery->getRelation($relation) instanceof HasManyThrough || $relatedQuery->getRelation($relation) instanceof BelongsToMany) {
$this->query->customWithAggregate($aggregateName, $column->aggregate ?? 'count', $columnName, $column->name);

return null;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Mediconesystems\LivewireDatatables\Tests;

use Illuminate\Support\Str;
use Illuminate\Support\Facades\View;
use Illuminate\Support\Str;
use Livewire\LivewireServiceProvider;
use Maatwebsite\Excel\ExcelServiceProvider;
use Mediconesystems\LivewireDatatables\LivewireDatatablesServiceProvider;
use Orchestra\Testbench\TestCase as Orchestra;
use Reedware\LaravelRelationJoins\LaravelRelationJoinServiceProvider;
use Mediconesystems\LivewireDatatables\LivewireDatatablesServiceProvider;

class TestCase extends Orchestra
{
Expand Down