Skip to content

Commit 39eb8c0

Browse files
committedNov 26, 2019
Merge branch 'pre/7.4.1'
2 parents 5afb458 + 44b07a1 commit 39eb8c0

File tree

4 files changed

+58
-1
lines changed

4 files changed

+58
-1
lines changed
 

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## Release 7.4.1
2+
3+
- We added the suppress operator `@` for the deprecation messages `@trigger_error()`.
4+
With this approach we don't break existing application that convert PHP errors in Exception
5+
(e.g. using Laravel with issue https://github.com/babenkoivan/scout-elasticsearch-driver/issues/297)
6+
Using the `@` operator is still possible to intercept the deprecation message using
7+
a custom error handler.
8+
[#973](https://github.com/elastic/elasticsearch-php/pull/973)
9+
- Add missing leading slash in the URL of put mapping endpoint
10+
[#970](https://github.com/elastic/elasticsearch-php/pull/970)
11+
- Fix pre 7.2 endpoint class name with aliases + reapply fix #947.
12+
This PR solved the unexpected BC break introduce in 7.4.0 with the code
13+
generation tool
14+
[#968](https://github.com/elastic/elasticsearch-php/pull/968)
15+
116
## Release 7.4.0
217

318
- Added the code generation for endpoints and namespaces based on

‎docs/build/Elasticsearch/Namespaces/IndicesNamespace.asciidoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ The class defines the following methods:
5151
* <<Elasticsearch_Namespaces_IndicesNamespaceupdateAliases_updateAliases,`updateAliases()`>>
5252
* <<Elasticsearch_Namespaces_IndicesNamespaceupgrade_upgrade,`upgrade()`>>
5353
* <<Elasticsearch_Namespaces_IndicesNamespacevalidateQuery_validateQuery,`validateQuery()`>>
54+
* <<Elasticsearch_Namespaces_IndicesNamespacegetAliases_getAliases,`getAliases()`>>
5455

5556

5657

@@ -970,3 +971,23 @@ $response = $client->indices()->validateQuery($params);
970971
****
971972

972973

974+
975+
[[Elasticsearch_Namespaces_IndicesNamespacegetAliases_getAliases]]
976+
.`getAliases()`
977+
****
978+
[source,php]
979+
----
980+
/*
981+
Alias function to getAlias()
982+
*/
983+
984+
$params = [
985+
// ...
986+
];
987+
988+
$client = ClientBuilder::create()->build();
989+
$response = $client->indices()->getAliases($params);
990+
----
991+
****
992+
993+

‎docs/build/Elasticsearch/Namespaces/TasksNamespace.asciidoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ The class defines the following methods:
1616
* <<Elasticsearch_Namespaces_TasksNamespacecancel_cancel,`cancel()`>>
1717
* <<Elasticsearch_Namespaces_TasksNamespaceget_get,`get()`>>
1818
* <<Elasticsearch_Namespaces_TasksNamespacelist_list,`list()`>>
19+
* <<Elasticsearch_Namespaces_TasksNamespacetasksList_tasksList,`tasksList()`>>
1920

2021

2122

@@ -83,3 +84,23 @@ $response = $client->tasks()->list($params);
8384
****
8485

8586

87+
88+
[[Elasticsearch_Namespaces_TasksNamespacetasksList_tasksList]]
89+
.`tasksList()`
90+
****
91+
[source,php]
92+
----
93+
/*
94+
Proxy function to list() to prevent BC break since 7.4.0
95+
*/
96+
97+
$params = [
98+
// ...
99+
];
100+
101+
$client = ClientBuilder::create()->build();
102+
$response = $client->tasks()->tasksList($params);
103+
----
104+
****
105+
106+

‎docs/build/renderer.index

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:19:"Sami\Renderer\Index":944:{a:3:{i:0;a:9:{s:20:"Elasticsearch\Client";s:40:"9eb6a91412561cbe36b6b571bc9851c278c85ccd";s:27:"Elasticsearch\ClientBuilder";s:40:"79318bc922f47119ea3a1b79e46c0133e42f55fe";s:37:"Elasticsearch\Namespaces\CatNamespace";s:40:"18615bfcca0fff8ff4604bfc4a7d3cb522beb842";s:41:"Elasticsearch\Namespaces\ClusterNamespace";s:40:"2ffe6325d7b0bf3c80411d845d4f2513774d120b";s:41:"Elasticsearch\Namespaces\IndicesNamespace";s:40:"18d027b1a6a041842f89ac736cd271afff70f084";s:40:"Elasticsearch\Namespaces\IngestNamespace";s:40:"230c5581ec9b9bcc011ae40c3079739ddf70a2c6";s:39:"Elasticsearch\Namespaces\NodesNamespace";s:40:"8cacfd1262fa5f34665c73972d17be0d8e243a17";s:42:"Elasticsearch\Namespaces\SnapshotNamespace";s:40:"b580a93f8731697fcf62c841ceae7399205bb8be";s:39:"Elasticsearch\Namespaces\TasksNamespace";s:40:"f6e32ea21f0b60f65a22d33228fb24599f665462";}i:1;a:1:{i:0;s:6:"master";}i:2;a:2:{i:0;s:13:"Elasticsearch";i:1;s:24:"Elasticsearch\Namespaces";}}}
1+
C:19:"Sami\Renderer\Index":944:{a:3:{i:0;a:9:{s:20:"Elasticsearch\Client";s:40:"498c4d5be950c9bd8aea481182d66604a88e28f3";s:27:"Elasticsearch\ClientBuilder";s:40:"4a02663ab50b5d678afd8fc06f8b3840d116e9f6";s:37:"Elasticsearch\Namespaces\CatNamespace";s:40:"8d5a7545dc03dede1231b99b255e93830d82dd43";s:41:"Elasticsearch\Namespaces\ClusterNamespace";s:40:"76efc72f51c81c55d786b6f1a5b991153409e754";s:41:"Elasticsearch\Namespaces\IndicesNamespace";s:40:"45eb11f7e963d832b6cf9a07559b38ae199d010a";s:40:"Elasticsearch\Namespaces\IngestNamespace";s:40:"45161815593d106eac15f02aaab8c9b4c945389d";s:39:"Elasticsearch\Namespaces\NodesNamespace";s:40:"fbc57ed03a175214b326243dcedd39d23e0e79af";s:42:"Elasticsearch\Namespaces\SnapshotNamespace";s:40:"d85d989bb5d31c674c7e75dd9efd43bd7c9b867e";s:39:"Elasticsearch\Namespaces\TasksNamespace";s:40:"36025b3b27666f4cf825bebe058e6cd5f6079ab1";}i:1;a:1:{i:0;s:6:"master";}i:2;a:2:{i:0;s:13:"Elasticsearch";i:1;s:24:"Elasticsearch\Namespaces";}}}

0 commit comments

Comments
 (0)