Fix for ES 6.7

Author: ezimuel

src/Elasticsearch/Endpoints/Bulk.php

@@ -78,7 +78,8 @@ public function getParamWhitelist()
             '_source_includes',
             '_source_exclude',
             '_source_excludes',
-            'pipeline'
+            'pipeline',
+            'seq_no_primary_term'
         );
     }
 

src/Elasticsearch/Endpoints/Delete.php

@@ -64,6 +64,9 @@ public function getParamWhitelist()
             'timeout',
             'version',
             'version_type',
+            'include_type_name',
+            'if_primary_term',
+            'if_seq_no'
         );
     }
 

src/Elasticsearch/Endpoints/Get.php

@@ -99,7 +99,8 @@ public function getParamWhitelist()
             '_source_excludes',
             'version',
             'version_type',
-            'stored_fields'
+            'stored_fields',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Index.php

@@ -96,7 +96,8 @@ public function getParamWhitelist()
             'version_type',
             'pipeline',
             'if_primary_term',
-            'if_seq_no'
+            'if_seq_no',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Create.php

@@ -65,7 +65,8 @@ public function getParamWhitelist()
             'timeout',
             'master_timeout',
             'update_all_types',
-            'wait_for_active_shards'
+            'wait_for_active_shards',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Field/Get.php

@@ -80,7 +80,7 @@ public function getParamWhitelist()
             'ignore_unavailable',
             'allow_no_indices',
             'expand_wildcards',
-            'local',
+            'local'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Get.php

@@ -67,7 +67,8 @@ public function getParamWhitelist()
             'ignore_unavailable',
             'allow_no_indices',
             'expand_wildcards',
-            'human'
+            'human',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Mapping/Get.php

@@ -48,6 +48,7 @@ public function getParamWhitelist()
             'expand_wildcards',
             'wildcard_expansion',
             'local',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Mapping/GetField.php

@@ -67,7 +67,8 @@ public function getParamWhitelist()
             'ignore_unavailable',
             'allow_no_indices',
             'expand_wildcards',
-            'local'
+            'local',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Mapping/Put.php

@@ -41,19 +41,21 @@ public function setBody($body)
      */
     public function getURI()
     {
-        if (isset($this->type) !== true) {
+        $index = $this->index ?? null;
+        $type = $this->type ?? null;
+
+        if (null === $index && $type === $index) {
             throw new Exceptions\RuntimeException(
-                'type is required for Put'
+                'type or index are required for Put'
             );
         }
-        $index = $this->index;
-        $type = $this->type;
-        $uri   = "/_mapping/$type";
-
-        if (isset($index) === true && isset($type) === true) {
-            $uri = "/$index/$type/_mapping";
-        } elseif (isset($type) === true) {
-            $uri = "/_mapping/$type";
+        $uri = '';
+        if (null !== $index) {
+            $uri = "/$index";
+        }
+        $uri .= '/_mapping';
+        if (null !== $type) {
+            $uri .= "/$type";
         }
 
         return $uri;
@@ -71,7 +73,8 @@ public function getParamWhitelist()
             'ignore_unavailable',
             'allow_no_indices',
             'expand_wildcards',
-            'update_all_types'
+            'update_all_types',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Rollover.php

@@ -98,6 +98,7 @@ public function getParamWhitelist()
             'timeout',
             'master_timeout',
             'wait_for_active_shards',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Template/Get.php

@@ -65,7 +65,8 @@ public function getParamWhitelist()
         return array(
             'flat_settings',
             'local',
-            'master_timeout'
+            'master_timeout',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Template/Put.php

@@ -89,7 +89,8 @@ public function getParamWhitelist()
             'timeout',
             'master_timeout',
             'flat_settings',
-            'create'
+            'create',
+            'include_type_name'
         );
     }
 

src/Elasticsearch/Endpoints/Search.php

@@ -104,7 +104,8 @@ public function getParamWhitelist()
             'batched_reduce_size',
             'typed_keys',
             'pre_filter_shard_size',
-            'rest_total_hits_as_int'
+            'rest_total_hits_as_int',
+            'seq_no_primary_term'
         );
     }
 

src/Elasticsearch/Endpoints/Update.php

@@ -87,7 +87,10 @@ public function getParamWhitelist()
             'ttl',
             'version',
             'version_type',
-            '_source'
+            '_source',
+            'include_type_name',
+            'if_primary_term',
+            'if_seq_no'
         );
     }