Fixed #1017 #1048

ezimuel · ezimuel · commit e5f5b2fd2aa3 · 2020-08-11T17:31:14.000+02:00
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') {

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function setType(?string $type)`
`160`	`160`	`*`
`161`	`161`	`* @return $this`
`162`	`162`	`*/`
`163`		`- public function setID($docID)`
	`163`	`+ public function setId($docID)`
`164`	`164`	`{`
`165`	`165`	`if ($docID === null) {`
`166`	`166`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,4 @@ public function setBody($body): Create`
`72`	`72`
`73`	`73`	`return $this;`
`74`	`74`	`}`
`75`		`-`
`76`		`- public function setId($id): Create`
`77`		`- {`
`78`		`- if (isset($id) !== true) {`
`79`		`- return $this;`
`80`		`- }`
`81`		`- $this->id = $id;`
`82`		`-`
`83`		`- return $this;`
`84`		`- }`
`85`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,4 @@ public function getMethod(): string`
`63`	`63`	`{`
`64`	`64`	`return 'DELETE';`
`65`	`65`	`}`
`66`		`-`
`67`		`- public function setId($id): Delete`
`68`		`- {`
`69`		`- if (isset($id) !== true) {`
`70`		`- return $this;`
`71`		`- }`
`72`		`- $this->id = $id;`
`73`		`-`
`74`		`- return $this;`
`75`		`- }`
`76`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,4 @@ public function getMethod(): string`
`42`	`42`	`{`
`43`	`43`	`return 'DELETE';`
`44`	`44`	`}`
`45`		`-`
`46`		`- public function setId($id): DeleteScript`
`47`		`- {`
`48`		`- if (isset($id) !== true) {`
`49`		`- return $this;`
`50`		`- }`
`51`		`- $this->id = $id;`
`52`		`-`
`53`		`- return $this;`
`54`		`- }`
`55`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,4 @@ public function getMethod(): string`
`65`	`65`	`{`
`66`	`66`	`return 'HEAD';`
`67`	`67`	`}`
`68`		`-`
`69`		`- public function setId($id): Exists`
`70`		`- {`
`71`		`- if (isset($id) !== true) {`
`72`		`- return $this;`
`73`		`- }`
`74`		`- $this->id = $id;`
`75`		`-`
`76`		`- return $this;`
`77`		`- }`
`78`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,4 @@ public function getMethod(): string`
`64`	`64`	`{`
`65`	`65`	`return 'HEAD';`
`66`	`66`	`}`
`67`		`-`
`68`		`- public function setId($id): ExistsSource`
`69`		`- {`
`70`		`- if (isset($id) !== true) {`
`71`		`- return $this;`
`72`		`- }`
`73`		`- $this->id = $id;`
`74`		`-`
`75`		`- return $this;`
`76`		`- }`
`77`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,4 @@ public function setBody($body): Explain`
`77`	`77`
`78`	`78`	`return $this;`
`79`	`79`	`}`
`80`		`-`
`81`		`- public function setId($id): Explain`
`82`		`- {`
`83`		`- if (isset($id) !== true) {`
`84`		`- return $this;`
`85`		`- }`
`86`		`- $this->id = $id;`
`87`		`-`
`88`		`- return $this;`
`89`		`- }`
`90`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,4 @@ public function getMethod(): string`
`41`	`41`	`{`
`42`	`42`	`return 'GET';`
`43`	`43`	`}`
`44`		`-`
`45`		`- public function setId($id): GetScript`
`46`		`- {`
`47`		`- if (isset($id) !== true) {`
`48`		`- return $this;`
`49`		`- }`
`50`		`- $this->id = $id;`
`51`		`-`
`52`		`- return $this;`
`53`		`- }`
`54`	`44`	`}`