Revert "ES7 support"

This reverts commit 3ab3a7a

Author: ivan.babenko

composer.json

@@ -21,13 +21,13 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
-        "elasticsearch/elasticsearch": "^7.0",
-        "laravel/scout": "^7.0"
+        "php": ">=7.1.3",
+        "elasticsearch/elasticsearch": "6.*",
+        "laravel/scout": "7.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "mockery/mockery": "^1.0"
+        "phpunit/phpunit": "7.*",
+        "mockery/mockery": "1.*"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   php:
-    image: babenkoivan/scout-elasticsearch-driver-php-cli:php7.2-laravel5.8
+    image: babenkoivan/scout-elasticsearch-driver-php-cli:1.0.1
     command: >
       sh -c 'check-connection mysql 3306 &&
              check-connection elastic 9200 &&
@@ -27,6 +27,4 @@ services:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: app
   elastic:
-    image: elasticsearch:7.1.1
-    environment:
-      discovery.type: single-node
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.4

src/Console/ElasticIndexCreateCommand.php

@@ -33,6 +33,7 @@ protected function createIndex()
 
         $payload = (new IndexPayload($configurator))
             ->setIfNotEmpty('body.settings', $configurator->getSettings())
+            ->setIfNotEmpty('body.mappings._default_', $configurator->getDefaultMapping())
             ->get();
 
         ElasticClient::indices()
@@ -53,7 +54,7 @@ protected function createWriteAlias()
     {
         $configurator = $this->getIndexConfigurator();
 
-        if (!in_array(Migratable::class, class_uses_recursive($configurator))) {
+        if (! in_array(Migratable::class, class_uses_recursive($configurator))) {
             return;
         }
 

src/Console/ElasticIndexUpdateCommand.php

@@ -39,7 +39,7 @@ protected function updateIndex()
 
         $indices = ElasticClient::indices();
 
-        if (!$indices->exists($indexPayload)) {
+        if (! $indices->exists($indexPayload)) {
             throw new LogicException(sprintf(
                 'Index %s doesn\'t exist',
                 $configurator->getName()
@@ -57,6 +57,15 @@ protected function updateIndex()
                 $indices->putSettings($indexSettingsPayload);
             }
 
+            if ($defaultMapping = $configurator->getDefaultMapping()) {
+                $indexMappingPayload = (new IndexPayload($configurator))
+                    ->set('type', '_default_')
+                    ->set('body._default_', $defaultMapping)
+                    ->get();
+
+                $indices->putMapping($indexMappingPayload);
+            }
+
             $indices->open($indexPayload);
         } catch (Exception $exception) {
             $indices->open($indexPayload);
@@ -79,7 +88,7 @@ protected function createWriteAlias()
     {
         $configurator = $this->getIndexConfigurator();
 
-        if (!in_array(Migratable::class, class_uses_recursive($configurator))) {
+        if (! in_array(Migratable::class, class_uses_recursive($configurator))) {
             return;
         }
 

src/Console/ElasticMigrateCommand.php

@@ -73,6 +73,7 @@ protected function createTargetIndex()
         $payload = (new RawPayload())
             ->set('index', $targetIndex)
             ->setIfNotEmpty('body.settings', $sourceIndexConfigurator->getSettings())
+            ->setIfNotEmpty('body.mappings._default_', $sourceIndexConfigurator->getDefaultMapping())
             ->get();
 
         ElasticClient::indices()
@@ -115,6 +116,16 @@ protected function updateTargetIndex()
                 $indices->putSettings($targetIndexSettingsPayload);
             }
 
+            if ($defaultMapping = $sourceIndexConfigurator->getDefaultMapping()) {
+                $targetIndexMappingPayload = (new RawPayload())
+                    ->set('index', $targetIndex)
+                    ->set('type', '_default_')
+                    ->set('body._default_', $defaultMapping)
+                    ->get();
+
+                $indices->putMapping($targetIndexMappingPayload);
+            }
+
             $indices->open($targetIndexPayload);
         } catch (Exception $exception) {
             $indices->open($targetIndexPayload);
@@ -158,8 +169,7 @@ protected function updateTargetIndexMapping()
         $payload = (new RawPayload())
             ->set('index', $targetIndex)
             ->set('type', $targetType)
-            ->set('include_type_name', 'true')
-            ->set('body.' . $targetType, $mapping)
+            ->set('body.'.$targetType, $mapping)
             ->get();
 
         ElasticClient::indices()
@@ -329,7 +339,7 @@ public function handle()
         $sourceModel = $this->getModel();
         $sourceIndexConfigurator = $sourceModel->getIndexConfigurator();
 
-        if (!in_array(Migratable::class, class_uses_recursive($sourceIndexConfigurator))) {
+        if (! in_array(Migratable::class, class_uses_recursive($sourceIndexConfigurator))) {
             $this->error(sprintf(
                 'The %s index configurator must use the %s trait.',
                 get_class($sourceIndexConfigurator),

src/Console/ElasticUpdateMappingCommand.php

@@ -30,7 +30,7 @@ class ElasticUpdateMappingCommand extends Command
      */
     public function handle()
     {
-        if (!$model = $this->getModel()) {
+        if (! $model = $this->getModel()) {
             return;
         }
 
@@ -45,14 +45,14 @@ public function handle()
             throw new LogicException('Nothing to update: the mapping is not specified.');
         }
 
-        $payload = (new TypePayload($model))
-            ->set('body.' . $model->searchableAs(), $mapping)
-            ->set('include_type_name', 'true');
+        $payload = new TypePayload($model);
 
         if (in_array(Migratable::class, class_uses_recursive($configurator))) {
             $payload->useAlias('write');
         }
 
+        $payload->set('body.'.$model->searchableAs(), $mapping);
+
         ElasticClient::indices()
             ->putMapping($payload->get());