Skip to content

Commit fb528f2

Browse files
committed
Merge branch '7.7' into 7.x
2 parents 9d9995b + 49a6c10 commit fb528f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+27
-390
lines changed

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
STACK_VERSION:
3-
- 7.x-SNAPSHOT
3+
- 7.7.0-SNAPSHOT
44

55
PHP_VERSION:
66
- 7.4-cli

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
env:
3131
global:
32-
- STACK_VERSION="7.x-SNAPSHOT"
32+
- STACK_VERSION="7.7-SNAPSHOT"
3333

3434
before_install:
3535
- ./travis/run_es_docker.sh

src/Elasticsearch/Endpoints/AbstractEndpoint.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function setType(?string $type)
160160
*
161161
* @return $this
162162
*/
163-
public function setID($docID)
163+
public function setId($docID)
164164
{
165165
if ($docID === null) {
166166
return $this;
@@ -169,7 +169,7 @@ public function setID($docID)
169169
if (is_int($docID)) {
170170
$docID = (string) $docID;
171171
}
172-
172+
173173
$this->id = urlencode($docID);
174174

175175
return $this;

src/Elasticsearch/Endpoints/AsyncSearch/Delete.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,4 @@ public function getMethod(): string
3939
{
4040
return 'DELETE';
4141
}
42-
43-
public function setId($id): Delete
44-
{
45-
if (isset($id) !== true) {
46-
return $this;
47-
}
48-
$this->id = $id;
49-
50-
return $this;
51-
}
5242
}

src/Elasticsearch/Endpoints/AsyncSearch/Get.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,4 @@ public function getMethod(): string
4343
{
4444
return 'GET';
4545
}
46-
47-
public function setId($id): Get
48-
{
49-
if (isset($id) !== true) {
50-
return $this;
51-
}
52-
$this->id = $id;
53-
54-
return $this;
55-
}
5646
}

src/Elasticsearch/Endpoints/Cat/MlDataFrameAnalytics.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,4 @@ public function getMethod(): string
4747
{
4848
return 'GET';
4949
}
50-
51-
public function setId($id): MlDataFrameAnalytics
52-
{
53-
if (isset($id) !== true) {
54-
return $this;
55-
}
56-
$this->id = $id;
57-
58-
return $this;
59-
}
6050
}

src/Elasticsearch/Endpoints/Create.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,4 @@ public function setBody($body): Create
7272

7373
return $this;
7474
}
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-
}
8575
}

src/Elasticsearch/Endpoints/Delete.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,4 @@ public function getMethod(): string
6363
{
6464
return 'DELETE';
6565
}
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-
}
7666
}

src/Elasticsearch/Endpoints/DeleteScript.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,4 @@ public function getMethod(): string
4242
{
4343
return 'DELETE';
4444
}
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-
}
5545
}

src/Elasticsearch/Endpoints/Exists.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,4 @@ public function getMethod(): string
6565
{
6666
return 'HEAD';
6767
}
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-
}
7868
}

0 commit comments

Comments
 (0)