Merge remote-tracking branch 'elasticsearch-php/fix/7.4.2' into HEAD

Author: ezimuel

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Release 7.4.2
+
+- Fixed indexing fails for item IDs that contain slashes
+  [#1048](https://github.com/elastic/elasticsearch-php/issues/1048)
+  [#1017](https://github.com/elastic/elasticsearch-php/pull/1017)
+
 ## Release 7.4.1
 
 - We added the suppress operator `@` for the deprecation messages `@trigger_error()`.

src/Elasticsearch/Client.php

@@ -32,7 +32,7 @@
  */
 class Client
 {
-    const VERSION = '7.4.1';
+    const VERSION = '7.4.2';
 
     /**
      * @var Transport

src/Elasticsearch/Endpoints/AbstractEndpoint.php

@@ -160,7 +160,7 @@ public function setType(?string $type)
      *
      * @return $this
      */
-    public function setID($docID)
+    public function setId($docID)
     {
         if ($docID === null) {
             return $this;

src/Elasticsearch/Endpoints/Create.php

@@ -72,14 +72,4 @@ public function setBody($body): Create
 
         return $this;
     }
-
-    public function setId($id): Create
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/Delete.php

@@ -63,14 +63,4 @@ public function getMethod(): string
     {
         return 'DELETE';
     }
-
-    public function setId($id): Delete
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/DeleteScript.php

@@ -42,14 +42,4 @@ public function getMethod(): string
     {
         return 'DELETE';
     }
-
-    public function setId($id): DeleteScript
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/Exists.php

@@ -65,14 +65,4 @@ public function getMethod(): string
     {
         return 'HEAD';
     }
-
-    public function setId($id): Exists
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/ExistsSource.php

@@ -64,14 +64,4 @@ public function getMethod(): string
     {
         return 'HEAD';
     }
-
-    public function setId($id): ExistsSource
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/Explain.php

@@ -77,14 +77,4 @@ public function setBody($body): Explain
 
         return $this;
     }
-
-    public function setId($id): Explain
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }

src/Elasticsearch/Endpoints/Get.php

@@ -65,14 +65,4 @@ public function getMethod(): string
     {
         return 'GET';
     }
-
-    public function setId($id): Get
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }