Merge pull request #14 from matchish/analysis-8nEOx5

Apply fixes from StyleCI
matchish · May 6, 2019 · 575cdf4 · 575cdf4
2 parents a4f73e6 + 0985bea
commit 575cdf4
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 51 deletions.
diff --git a/resources/lang/en/flush.php b/resources/lang/en/flush.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'done' => 'All [:searchable] records have been flushed.',
 ];
diff --git a/resources/lang/en/import.php b/resources/lang/en/import.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'start' => 'Importing [:searchable]',
     'done' => 'All [:searchable] records have been imported.',

diff --git a/src/Console/Commands/FlushCommand.php b/src/Console/Commands/FlushCommand.php
@@ -33,7 +33,7 @@ public function handle(): void
         $searchableList->each(function ($searchable) {
             $searchable::removeAllFromSearch();
             $doneMessage = trans('scout::flush.done', [
-                'searchable' => $searchable
+                'searchable' => $searchable,
             ]);
             $this->output->success($doneMessage);
         });

diff --git a/src/Console/Commands/ImportCommand.php b/src/Console/Commands/ImportCommand.php
@@ -35,9 +35,9 @@ private function searchableList($argument)
     {
         return collect($argument)->whenEmpty(function () {
             $factory = new SearchableListFactory(app()->getNamespace(), app()->path());
+
             return $factory->make();
         });
-
     }
 
     private function import($searchable)
@@ -58,9 +58,8 @@ private function import($searchable)
             ->allOnConnection(config((new $searchable)->syncWithSearchUsing()));
 
         $doneMessage = trans(config('scout.queue') ? 'scout::import.done.queue' : 'scout::import.done', [
-            'searchable' => $searchable
+            'searchable' => $searchable,
         ]);
         $this->output->success($doneMessage);
-
     }
 }
diff --git a/src/Console/Commands/ProgressBarFactory.php b/src/Console/Commands/ProgressBarFactory.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Matchish\ScoutElasticSearch\Console\Commands;
 
 use Symfony\Component\Console\Style\OutputStyle;
@@ -24,12 +23,12 @@ public function create(int $max = 0)
     {
         $bar = $this->output->createProgressBar($max);
         $bar->setBarCharacter('<fg=green>⚬</>');
-        $bar->setEmptyBarCharacter("<fg=red>⚬</>");
-        $bar->setProgressCharacter("<fg=green>➤</>");
+        $bar->setEmptyBarCharacter('<fg=red>⚬</>');
+        $bar->setProgressCharacter('<fg=green>➤</>');
         $bar->setFormat(
             "%message%\n%current%/%max% [%bar%] %percent:3s%%\n"
         );
+
         return $bar;
     }
-
 }
diff --git a/src/Engines/ElasticSearchEngine.php b/src/Engines/ElasticSearchEngine.php
@@ -8,7 +8,6 @@
 use Laravel\Scout\Builder as BaseBuilder;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use Matchish\ScoutElasticSearch\ElasticSearch\Index;
-use Matchish\ScoutElasticSearch\Pipelines\ImportPipeline;
 use Matchish\ScoutElasticSearch\ElasticSearch\Params\Bulk;
 use Matchish\ScoutElasticSearch\ElasticSearch\SearchFactory;
 use Matchish\ScoutElasticSearch\ElasticSearch\SearchResults;

diff --git a/src/Jobs/Import.php b/src/Jobs/Import.php
@@ -36,7 +36,7 @@ public function handle(Client $elasticsearch): void
         $stages = $this->stages();
         $estimate = $stages->sum->estimate();
         $this->progressBar()->setMaxSteps($estimate);
-        $stages->each(function ($stage) use ($elasticsearch){
+        $stages->each(function ($stage) use ($elasticsearch) {
             $this->progressBar()->setMessage($stage->title());
             $stage->handle($elasticsearch);
             $this->progressBar()->advance($stage->estimate());

diff --git a/src/Jobs/ImportStages.php b/src/Jobs/ImportStages.php
@@ -1,21 +1,18 @@
 <?php
 
-
 namespace Matchish\ScoutElasticSearch\Jobs;
 
-
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Matchish\ScoutElasticSearch\ElasticSearch\Index;
 use Matchish\ScoutElasticSearch\Jobs\Stages\CleanUp;
-use Matchish\ScoutElasticSearch\Jobs\Stages\CreateWriteIndex;
-use Matchish\ScoutElasticSearch\Jobs\Stages\PullFromSource;
 use Matchish\ScoutElasticSearch\Jobs\Stages\RefreshIndex;
+use Matchish\ScoutElasticSearch\Jobs\Stages\PullFromSource;
+use Matchish\ScoutElasticSearch\Jobs\Stages\CreateWriteIndex;
 use Matchish\ScoutElasticSearch\Jobs\Stages\SwitchToNewAndRemoveOldIndex;
 
 class ImportStages extends Collection
 {
-
     /**
      * @param Model $searchable
      * @return Collection

diff --git a/src/Jobs/QueueableJob.php b/src/Jobs/QueueableJob.php
@@ -1,21 +1,17 @@
 <?php
 
-
 namespace Matchish\ScoutElasticSearch\Jobs;
 
-
-use Elasticsearch\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Matchish\ScoutElasticSearch\ProgressReportable;
 
-class QueueableJob  implements ShouldQueue
+class QueueableJob implements ShouldQueue
 {
     use Queueable;
     use ProgressReportable;
 
     public function handle()
     {
-
     }
 }
diff --git a/src/Jobs/Stages/CleanUp.php b/src/Jobs/Stages/CleanUp.php
@@ -3,18 +3,17 @@
 namespace Matchish\ScoutElasticSearch\Jobs\Stages;
 
 use Elasticsearch\Client;
-use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable;
+use Illuminate\Database\Eloquent\Model;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
-use Matchish\ScoutElasticSearch\ElasticSearch\Params\Indices\Delete as DeleteIndexParams;
 use Matchish\ScoutElasticSearch\ElasticSearch\Params\Indices\Alias\Get as GetAliasParams;
+use Matchish\ScoutElasticSearch\ElasticSearch\Params\Indices\Delete as DeleteIndexParams;
 
 /**
  * @internal
  */
 final class CleanUp
 {
-
     /**
      * @var Model
      */

diff --git a/src/Jobs/Stages/CreateWriteIndex.php b/src/Jobs/Stages/CreateWriteIndex.php
@@ -3,8 +3,8 @@
 namespace Matchish\ScoutElasticSearch\Jobs\Stages;
 
 use Elasticsearch\Client;
-use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable;
+use Illuminate\Database\Eloquent\Model;
 use Matchish\ScoutElasticSearch\ElasticSearch\Index;
 use Matchish\ScoutElasticSearch\ElasticSearch\WriteAlias;
 use Matchish\ScoutElasticSearch\ElasticSearch\DefaultAlias;
@@ -35,7 +35,6 @@ public function __construct(Model $searchable, Index $index)
     }
 
     public function handle(Client $elasticsearch): void
-
     {
         /** @var Searchable $searchable */
         $searchable = $this->searchable;
@@ -58,5 +57,4 @@ public function estimate(): int
     {
         return 1;
     }
-
 }
diff --git a/src/Jobs/Stages/PullFromSource.php b/src/Jobs/Stages/PullFromSource.php
@@ -60,8 +60,10 @@ public static function chunked(Model $searchable): Collection
         if ($totalSearchables) {
             $chunkSize = (int) config('scout.chunk.searchable', self::DEFAULT_CHUNK_SIZE);
             $totalChunks = (int) ceil($totalSearchables / $chunkSize);
+
             return collect(range(1, $totalChunks))->map(function ($page) use ($query, $chunkSize) {
                 $clone = (clone $query)->forPage($page, $chunkSize);
+
                 return new static($clone);
             });
         } else {

diff --git a/src/Jobs/Stages/SwitchToNewAndRemoveOldIndex.php b/src/Jobs/Stages/SwitchToNewAndRemoveOldIndex.php
@@ -3,8 +3,8 @@
 namespace Matchish\ScoutElasticSearch\Jobs\Stages;
 
 use Elasticsearch\Client;
-use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable;
+use Illuminate\Database\Eloquent\Model;
 use Matchish\ScoutElasticSearch\ElasticSearch\Index;
 use Matchish\ScoutElasticSearch\ElasticSearch\Params\Indices\Alias\Get;
 use Matchish\ScoutElasticSearch\ElasticSearch\Params\Indices\Alias\Update;
@@ -33,10 +33,10 @@ public function __construct(Model $searchable, Index $index)
     }
 
     public function handle(Client $elasticsearch): void
-   {
-       /** @var Searchable $searchable */
-       $searchable = $this->searchable;
-       $params = Get::anyIndex($searchable->searchableAs());
+    {
+        /** @var Searchable $searchable */
+        $searchable = $this->searchable;
+        $params = Get::anyIndex($searchable->searchableAs());
         $response = $elasticsearch->indices()->getAliases($params->toArray());
 
         $params = new Update();
@@ -47,7 +47,7 @@ public function handle(Client $elasticsearch): void
                 $params->add((string) $indexName, $searchable->searchableAs());
             }
         }
-       $elasticsearch->indices()->updateAliases($params->toArray());
+        $elasticsearch->indices()->updateAliases($params->toArray());
     }
 
     public function estimate(): int

diff --git a/src/ProgressReportable.php b/src/ProgressReportable.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Matchish\ScoutElasticSearch;
 
 use Symfony\Component\Console\Output\NullOutput;
@@ -19,5 +18,4 @@ private function progressBar(): ProgressBar
     {
         return $this->progressBar ?: new ProgressBar(new NullOutput());
     }
-
 }
diff --git a/tests/Feature/ImportCommandTest.php b/tests/Feature/ImportCommandTest.php
@@ -5,8 +5,8 @@
 namespace Tests\Feature;
 
 use App\Book;
-use App\Product;
 use stdClass;
+use App\Product;
 use Tests\IntegrationTestCase;
 use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Output\BufferedOutput;
@@ -126,13 +126,13 @@ public function test_progress_report()
             trans('scout::import.start', ['searchable' => Product::class]),
             trim($output[0]));
         $this->assertEquals(
-            '[OK] ' . trans('scout::import.done', ['searchable' => Product::class]),
+            '[OK] '.trans('scout::import.done', ['searchable' => Product::class]),
             trim($output[2]));
         $this->assertEquals(
             trans('scout::import.start', ['searchable' => Book::class]),
             trim($output[4]));
         $this->assertEquals(
-            '[OK] ' . trans('scout::import.done', ['searchable' => Book::class]),
+            '[OK] '.trans('scout::import.done', ['searchable' => Book::class]),
             trim($output[6]));
     }
 
@@ -148,7 +148,7 @@ public function test_progress_report_in_queue()
             trans('scout::import.start', ['searchable' => Product::class]),
             trim($output[0]));
         $this->assertEquals(
-            '[OK] ' . trans('scout::import.done.queue', ['searchable' => Product::class]),
+            '[OK] '.trans('scout::import.done.queue', ['searchable' => Product::class]),
             trim($output[2]));
     }
 }
diff --git a/tests/Feature/ScoutElasticSearchServiceProviderTest.php b/tests/Feature/ScoutElasticSearchServiceProviderTest.php
@@ -2,8 +2,8 @@
 
 namespace Matchish\ScoutElasticSearch;
 
-use Elasticsearch\Client;
 use Tests\TestCase;
+use Elasticsearch\Client;
 
 class ScoutElasticSearchServiceProviderTest extends TestCase
 {

diff --git a/tests/Integration/Jobs/ImportTest.php b/tests/Integration/Jobs/ImportTest.php
@@ -3,15 +3,14 @@
 namespace Tests\Integration\Jobs;
 
 use App\Product;
+use Tests\IntegrationTestCase;
 use Illuminate\Console\OutputStyle;
 use Matchish\ScoutElasticSearch\Jobs\Import;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Tests\Fixtures\DummyOutput;
-use Tests\IntegrationTestCase;
 
 class ImportTest extends IntegrationTestCase
 {
-
     public function test_progress_report()
     {
         $dispatcher = Product::getEventDispatcher();

diff --git a/tests/Integration/Jobs/Stages/CleanUpTest.php b/tests/Integration/Jobs/Stages/CleanUpTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Integration\Jobs\Stages;
 
-use App\Product;
 use stdClass;
+use App\Product;
 use Tests\IntegrationTestCase;
 use Matchish\ScoutElasticSearch\Jobs\Stages\CleanUp;
 
@@ -32,5 +32,4 @@ public function test_remove_write_index()
         $this->assertFalse($writeIndexExist);
         $this->assertTrue($readIndexExist);
     }
-
 }
diff --git a/tests/Integration/Jobs/Stages/PullFromSourceTest.php b/tests/Integration/Jobs/Stages/PullFromSourceTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Integration\Jobs\Stages;
 
-use App\Product;
 use stdClass;
+use App\Product;
 use Tests\IntegrationTestCase;
 use Matchish\ScoutElasticSearch\Jobs\Stages\PullFromSource;
 
@@ -167,7 +167,6 @@ public function test_pull_soft_deleted()
 
     public function test_no_searchables_no_chunks()
     {
-
         $stages = PullFromSource::chunked(new Product());
 
         $this->assertEquals(0, $stages->count());
@@ -201,5 +200,4 @@ public function test_chunked_pull_only_one_page()
 
         $this->assertEquals(3, $response['hits']['total']);
     }
-
 }
diff --git a/tests/Integration/Jobs/Stages/SwitchToNewAndRemoveOldIndexTest.php b/tests/Integration/Jobs/Stages/SwitchToNewAndRemoveOldIndexTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Integration\Jobs\Stages;
 
-use App\Product;
 use stdClass;
+use App\Product;
 use Tests\IntegrationTestCase;
 use Matchish\ScoutElasticSearch\ElasticSearch\Index;
 use Matchish\ScoutElasticSearch\Jobs\Stages\SwitchToNewAndRemoveOldIndex;

diff --git a/tests/Unit/Jobs/ImportStagesTest.php b/tests/Unit/Jobs/ImportStagesTest.php
@@ -3,13 +3,13 @@
 namespace Tests\Unit\Jobs;
 
 use App\Product;
+use Tests\TestCase;
 use Matchish\ScoutElasticSearch\Jobs\ImportStages;
 use Matchish\ScoutElasticSearch\Jobs\Stages\CleanUp;
-use Matchish\ScoutElasticSearch\Jobs\Stages\CreateWriteIndex;
-use Matchish\ScoutElasticSearch\Jobs\Stages\PullFromSource;
 use Matchish\ScoutElasticSearch\Jobs\Stages\RefreshIndex;
+use Matchish\ScoutElasticSearch\Jobs\Stages\PullFromSource;
+use Matchish\ScoutElasticSearch\Jobs\Stages\CreateWriteIndex;
 use Matchish\ScoutElasticSearch\Jobs\Stages\SwitchToNewAndRemoveOldIndex;
-use Tests\TestCase;
 
 class ImportStagesTest extends TestCase
 {