Merge pull request #98 from ametad/merge-config

Follow up: #94 Merge config from vendor

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ## [Unreleased]
 
+
+## [3.0.3] - 2020-03-14
+### Added
+-  Load config from package [#84](https://github.com/matchish/laravel-scout-elasticsearch/issues/84)
+
 ## [3.0.2] - 2020-03-14
 ### Added
 -  Populate routing meta-field [#90](https://github.com/matchish/laravel-scout-elasticsearch/issues/90)

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "matchish/laravel-scout-elasticsearch",
     "description": "Search among multiple models with ElasticSearch and Laravel Scout",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "keywords": [
         "laravel",
         "scout",

docker-compose.yml

@@ -9,6 +9,7 @@ services:
     user: "1000:1000"
     depends_on:
       - elasticsearch
+      - db
     volumes:
       - /etc/passwd:/etc/passwd:ro
       - /etc/group:/etc/group:ro

src/ElasticSearchServiceProvider.php

@@ -15,6 +15,8 @@ final class ElasticSearchServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
+        $this->mergeConfigFrom(__DIR__.'/../config/elasticsearch.php', 'elasticsearch');
+
         $this->app->bind(Client::class, function () {
             return ClientBuilder::create()->setHosts([config('elasticsearch.host')])->build();
         });

tests/Feature/ScoutElasticSearchServiceProviderTest.php

@@ -7,17 +7,26 @@
 
 class ScoutElasticSearchServiceProviderTest extends TestCase
 {
+    public function test_config_is_merged_from_the_package()
+    {
+        $distConfig = require __DIR__.'/../../config/elasticsearch.php';
+
+        $this->assertSame($distConfig, config('elasticsearch'));
+    }
+
     public function test_config_publishing()
     {
-        \File::delete(config_path('elasticsearch.php'));
         $provider = new ElasticSearchServiceProvider($this->app);
+        $provider->register();
         $provider->boot();
 
-        \Artisan::call('vendor:publish', [
+        $this->artisan('vendor:publish', [
             '--tag' => 'config',
-        ]);
+        ])->assertExitCode(0);
 
         $this->assertFileExists(config_path('elasticsearch.php'));
+
+        \File::delete(config_path('elasticsearch.php'));
     }
 
     public function test_provides()

tests/IntegrationTestCase.php

@@ -25,4 +25,21 @@ public function setUp(): void
 
         $this->elasticsearch->indices()->delete(['index' => '_all']);
     }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']->set('elasticsearch', require(__DIR__.'/../config/elasticsearch.php'));
+        $app['config']->set('elasticsearch.indices.mappings.products', [
+            'properties' => [
+                'type' => [
+                    'type' => 'keyword',
+                ],
+                'price' => [
+                    'type' => 'integer',
+                ],
+            ],
+        ]);
+    }
 }

tests/TestCase.php

@@ -37,17 +37,6 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('scout.queue', false);
         // Setup default database to use sqlite :memory:
         $app['config']->set('database.default', 'mysql');
-        $app['config']->set('elasticsearch', require(__DIR__.'/../config/elasticsearch.php'));
-        $app['config']->set('elasticsearch.indices.mappings.products', [
-            'properties' => [
-                'type' => [
-                    'type' => 'keyword',
-                ],
-                'price' => [
-                    'type' => 'integer',
-                ],
-            ],
-        ]);
     }
 
     protected function getPackageProviders($app)