From e1dba8b0d052da0fb22b8377d9ecd1d0bbc48fe6 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 10 Sep 2019 16:28:32 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Builder.php | 2 +- src/Console/ImportCommand.php | 2 +- src/EngineManager.php | 6 +++--- src/Engines/AlgoliaEngine.php | 4 ++-- src/Engines/NullEngine.php | 2 +- src/Jobs/MakeSearchable.php | 2 +- src/Searchable.php | 2 +- src/SearchableScope.php | 2 +- tests/AlgoliaEngineTest.php | 10 +++++----- tests/BuilderTest.php | 8 ++++---- tests/Fixtures/SearchableModel.php | 2 +- tests/MakeSearchableTest.php | 4 ++-- tests/ModelObserverTest.php | 2 +- tests/SearchableTest.php | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Builder.php b/src/Builder.php index a65cf022..58309377 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -2,9 +2,9 @@ namespace Laravel\Scout; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\Paginator; use Illuminate\Support\Traits\Macroable; -use Illuminate\Pagination\LengthAwarePaginator; class Builder { diff --git a/src/Console/ImportCommand.php b/src/Console/ImportCommand.php index 7c0a04cd..0493af6a 100644 --- a/src/Console/ImportCommand.php +++ b/src/Console/ImportCommand.php @@ -3,8 +3,8 @@ namespace Laravel\Scout\Console; use Illuminate\Console\Command; -use Laravel\Scout\Events\ModelsImported; use Illuminate\Contracts\Events\Dispatcher; +use Laravel\Scout\Events\ModelsImported; class ImportCommand extends Command { diff --git a/src/EngineManager.php b/src/EngineManager.php index 8f7f04c2..3df43419 100644 --- a/src/EngineManager.php +++ b/src/EngineManager.php @@ -2,12 +2,12 @@ namespace Laravel\Scout; +use Algolia\AlgoliaSearch\SearchClient as Algolia; +use Algolia\AlgoliaSearch\Support\UserAgent; use Exception; use Illuminate\Support\Manager; -use Laravel\Scout\Engines\NullEngine; use Laravel\Scout\Engines\AlgoliaEngine; -use Algolia\AlgoliaSearch\Support\UserAgent; -use Algolia\AlgoliaSearch\SearchClient as Algolia; +use Laravel\Scout\Engines\NullEngine; class EngineManager extends Manager { diff --git a/src/Engines/AlgoliaEngine.php b/src/Engines/AlgoliaEngine.php index 5159737b..b9b37bac 100644 --- a/src/Engines/AlgoliaEngine.php +++ b/src/Engines/AlgoliaEngine.php @@ -2,9 +2,9 @@ namespace Laravel\Scout\Engines; -use Laravel\Scout\Builder; -use Illuminate\Database\Eloquent\SoftDeletes; use Algolia\AlgoliaSearch\SearchClient as Algolia; +use Illuminate\Database\Eloquent\SoftDeletes; +use Laravel\Scout\Builder; class AlgoliaEngine extends Engine { diff --git a/src/Engines/NullEngine.php b/src/Engines/NullEngine.php index 4638c6d7..50f6422b 100644 --- a/src/Engines/NullEngine.php +++ b/src/Engines/NullEngine.php @@ -2,9 +2,9 @@ namespace Laravel\Scout\Engines; -use Laravel\Scout\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Collection as BaseCollection; +use Laravel\Scout\Builder; class NullEngine extends Engine { diff --git a/src/Jobs/MakeSearchable.php b/src/Jobs/MakeSearchable.php index 1584aa5f..6baaa2cc 100644 --- a/src/Jobs/MakeSearchable.php +++ b/src/Jobs/MakeSearchable.php @@ -3,8 +3,8 @@ namespace Laravel\Scout\Jobs; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\SerializesModels; class MakeSearchable implements ShouldQueue { diff --git a/src/Searchable.php b/src/Searchable.php index 1389ba55..83c3c66b 100644 --- a/src/Searchable.php +++ b/src/Searchable.php @@ -2,9 +2,9 @@ namespace Laravel\Scout; -use Laravel\Scout\Jobs\MakeSearchable; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Collection as BaseCollection; +use Laravel\Scout\Jobs\MakeSearchable; trait Searchable { diff --git a/src/SearchableScope.php b/src/SearchableScope.php index b8f07254..35f97f3c 100644 --- a/src/SearchableScope.php +++ b/src/SearchableScope.php @@ -2,11 +2,11 @@ namespace Laravel\Scout; +use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Scope; use Laravel\Scout\Events\ModelsFlushed; use Laravel\Scout\Events\ModelsImported; -use Illuminate\Database\Eloquent\Builder as EloquentBuilder; class SearchableScope implements Scope { diff --git a/tests/AlgoliaEngineTest.php b/tests/AlgoliaEngineTest.php index fc4775c0..fb1fb803 100644 --- a/tests/AlgoliaEngineTest.php +++ b/tests/AlgoliaEngineTest.php @@ -2,14 +2,14 @@ namespace Laravel\Scout\Tests; -use stdClass; -use Mockery as m; -use Laravel\Scout\Builder; -use PHPUnit\Framework\TestCase; use Algolia\AlgoliaSearch\SearchClient; -use Laravel\Scout\Engines\AlgoliaEngine; use Illuminate\Database\Eloquent\Collection; +use Laravel\Scout\Builder; +use Laravel\Scout\Engines\AlgoliaEngine; use Laravel\Scout\Tests\Fixtures\SearchableModel; +use Mockery as m; +use PHPUnit\Framework\TestCase; +use stdClass; class AlgoliaEngineTest extends TestCase { diff --git a/tests/BuilderTest.php b/tests/BuilderTest.php index db8cd7cf..6fa26b57 100644 --- a/tests/BuilderTest.php +++ b/tests/BuilderTest.php @@ -2,12 +2,12 @@ namespace Laravel\Scout\Tests; -use stdClass; -use Mockery as m; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Pagination\Paginator; use Laravel\Scout\Builder; +use Mockery as m; use PHPUnit\Framework\TestCase; -use Illuminate\Pagination\Paginator; -use Illuminate\Database\Eloquent\Collection; +use stdClass; class BuilderTest extends TestCase { diff --git a/tests/Fixtures/SearchableModel.php b/tests/Fixtures/SearchableModel.php index 5bba9a69..d6268323 100644 --- a/tests/Fixtures/SearchableModel.php +++ b/tests/Fixtures/SearchableModel.php @@ -2,8 +2,8 @@ namespace Laravel\Scout\Tests\Fixtures; -use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; +use Laravel\Scout\Searchable; class SearchableModel extends Model { diff --git a/tests/MakeSearchableTest.php b/tests/MakeSearchableTest.php index 1daa42cc..ff930e1a 100644 --- a/tests/MakeSearchableTest.php +++ b/tests/MakeSearchableTest.php @@ -2,10 +2,10 @@ namespace Laravel\Scout\Tests; +use Illuminate\Database\Eloquent\Collection; +use Laravel\Scout\Jobs\MakeSearchable; use Mockery as m; use PHPUnit\Framework\TestCase; -use Laravel\Scout\Jobs\MakeSearchable; -use Illuminate\Database\Eloquent\Collection; class MakeSearchableTest extends TestCase { diff --git a/tests/ModelObserverTest.php b/tests/ModelObserverTest.php index 12f0aeff..d51a3ea4 100644 --- a/tests/ModelObserverTest.php +++ b/tests/ModelObserverTest.php @@ -2,9 +2,9 @@ namespace Laravel\Scout\Tests; +use Laravel\Scout\ModelObserver; use Mockery as m; use PHPUnit\Framework\TestCase; -use Laravel\Scout\ModelObserver; class ModelObserverTest extends TestCase { diff --git a/tests/SearchableTest.php b/tests/SearchableTest.php index ab7c3964..d3267c3e 100644 --- a/tests/SearchableTest.php +++ b/tests/SearchableTest.php @@ -2,10 +2,10 @@ namespace Laravel\Scout\Tests; -use Mockery as m; -use PHPUnit\Framework\TestCase; use Illuminate\Database\Eloquent\Builder; use Laravel\Scout\Tests\Fixtures\SearchableModel; +use Mockery as m; +use PHPUnit\Framework\TestCase; class SearchableTest extends TestCase {