From 531b59df1ab2bbf73c54d940fd1d6163303c9d70 Mon Sep 17 00:00:00 2001 From: Yuriy Potemkin Date: Wed, 26 Feb 2020 16:44:03 +0300 Subject: [PATCH 1/2] lumen support --- src/ScoutElasticServiceProvider.php | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/ScoutElasticServiceProvider.php b/src/ScoutElasticServiceProvider.php index 79141db..f620570 100644 --- a/src/ScoutElasticServiceProvider.php +++ b/src/ScoutElasticServiceProvider.php @@ -5,6 +5,7 @@ use Elasticsearch\ClientBuilder; use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Str; use InvalidArgumentException; use Laravel\Scout\EngineManager; use ScoutElastic\Console\ElasticIndexCreateCommand; @@ -25,16 +26,20 @@ class ScoutElasticServiceProvider extends ServiceProvider */ public function boot() { - $this->publishes([ - __DIR__.'/../config/scout_elastic.php' => config_path('scout_elastic.php'), - ]); + if (!$this->isLumen()) { + $this->publishes([ + __DIR__.'/../config/scout_elastic.php' => config_path('scout_elastic.php'), + ]); - $this->commands([ - // make commands - IndexConfiguratorMakeCommand::class, - SearchableModelMakeCommand::class, - SearchRuleMakeCommand::class, + $this->commands([ + // make commands + IndexConfiguratorMakeCommand::class, + SearchableModelMakeCommand::class, + SearchRuleMakeCommand::class, + ]); + } + $this->commands([ // elastic commands ElasticIndexCreateCommand::class, ElasticIndexUpdateCommand::class, @@ -78,4 +83,9 @@ public function register() return ClientBuilder::fromConfig($config); }); } + + protected function isLumen() + { + return Str::contains($this->app->version(), 'Lumen'); + } } From 49920a700c4fc67f30a2481e4b672dfbb05e6b14 Mon Sep 17 00:00:00 2001 From: Yuriy Potemkin Date: Wed, 26 Feb 2020 17:50:50 +0300 Subject: [PATCH 2/2] fix ci --- src/ScoutElasticServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScoutElasticServiceProvider.php b/src/ScoutElasticServiceProvider.php index f620570..b405f77 100644 --- a/src/ScoutElasticServiceProvider.php +++ b/src/ScoutElasticServiceProvider.php @@ -26,7 +26,7 @@ class ScoutElasticServiceProvider extends ServiceProvider */ public function boot() { - if (!$this->isLumen()) { + if (! $this->isLumen()) { $this->publishes([ __DIR__.'/../config/scout_elastic.php' => config_path('scout_elastic.php'), ]);