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

elastic · Aug 11, 2020 · a80f54b · a80f54b
2 parents 39eb8c0 + e8ab8d0
commit a80f54b
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 187 deletions.
diff --git a/CHANGELOG.md b/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()`.

diff --git a/src/Elasticsearch/Client.php b/src/Elasticsearch/Client.php
@@ -32,7 +32,7 @@
  */
 class Client
 {
-    const VERSION = '7.4.1';
+    const VERSION = '7.4.2';
 
     /**
      * @var Transport

diff --git a/src/Elasticsearch/Endpoints/AbstractEndpoint.php b/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;

diff --git a/src/Elasticsearch/Endpoints/Create.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Delete.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/DeleteScript.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Exists.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/ExistsSource.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Explain.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Get.php b/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;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/GetScript.php b/src/Elasticsearch/Endpoints/GetScript.php
@@ -41,14 +41,4 @@ public function getMethod(): string
     {
         return 'GET';
     }
-
-    public function setId($id): GetScript
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/GetSource.php b/src/Elasticsearch/Endpoints/GetSource.php
@@ -64,14 +64,4 @@ public function getMethod(): string
     {
         return 'GET';
     }
-
-    public function setId($id): GetSource
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Index.php b/src/Elasticsearch/Endpoints/Index.php
@@ -76,14 +76,4 @@ public function setBody($body): Index
 
         return $this;
     }
-
-    public function setId($id): Index
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Ingest/DeletePipeline.php b/src/Elasticsearch/Endpoints/Ingest/DeletePipeline.php
@@ -42,14 +42,4 @@ public function getMethod(): string
     {
         return 'DELETE';
     }
-
-    public function setId($id): DeletePipeline
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Ingest/GetPipeline.php b/src/Elasticsearch/Endpoints/Ingest/GetPipeline.php
@@ -40,14 +40,4 @@ public function getMethod(): string
     {
         return 'GET';
     }
-
-    public function setId($id): GetPipeline
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Ingest/PutPipeline.php b/src/Elasticsearch/Endpoints/Ingest/PutPipeline.php
@@ -52,14 +52,4 @@ public function setBody($body): PutPipeline
 
         return $this;
     }
-
-    public function setId($id): PutPipeline
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Ingest/Simulate.php b/src/Elasticsearch/Endpoints/Ingest/Simulate.php
@@ -50,14 +50,4 @@ public function setBody($body): Simulate
 
         return $this;
     }
-
-    public function setId($id): Simulate
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/PutScript.php b/src/Elasticsearch/Endpoints/PutScript.php
@@ -61,16 +61,6 @@ public function setBody($body): PutScript
         return $this;
     }
 
-    public function setId($id): PutScript
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
-
     public function setContext($context): PutScript
     {
         if (isset($context) !== true) {

diff --git a/src/Elasticsearch/Endpoints/RenderSearchTemplate.php b/src/Elasticsearch/Endpoints/RenderSearchTemplate.php
@@ -48,14 +48,4 @@ public function setBody($body): RenderSearchTemplate
 
         return $this;
     }
-
-    public function setId($id): RenderSearchTemplate
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/TermVectors.php b/src/Elasticsearch/Endpoints/TermVectors.php
@@ -77,14 +77,4 @@ public function setBody($body): TermVectors
 
         return $this;
     }
-
-    public function setId($id): TermVectors
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Elasticsearch/Endpoints/Update.php b/src/Elasticsearch/Endpoints/Update.php
@@ -76,14 +76,4 @@ public function setBody($body): Update
 
         return $this;
     }
-
-    public function setId($id): Update
-    {
-        if (isset($id) !== true) {
-            return $this;
-        }
-        $this->id = $id;
-
-        return $this;
-    }
 }
diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -588,10 +588,6 @@ public function operationMatch($operation, $lastOperationResult, &$context, stri
                     }
                 }
                 break;
-            case 'Basic':
-                // Fix issue converting "中文" in unicode
-                $match = is_string($match) ? utf8_decode($match) : $match;
-                break;
         }
 
         $expected = $this->replaceWithContext(current($operation), $context);

diff --git a/util/Endpoint.php b/util/Endpoint.php
@@ -167,7 +167,7 @@ public function renderClass(): string
             }
         }
         foreach ($this->parts as $part => $value) {
-            if (in_array($part, ['type', 'index'])) {
+            if (in_array($part, ['type', 'index', 'id'])) {
                 continue;
             }
             if (isset($value['type']) && $value['type'] === 'list') {