Skip to content

Commit b824bb7

Browse files
committed
[DOCS] Update version tables
1 parent c71524c commit b824bb7

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

Diff for: README.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ Version Matrix
2525

2626
| Elasticsearch Version | Elasticsearch-PHP Branch |
2727
| --------------------- | ------------------------ |
28-
| >= 5.0 | 5.0 |
28+
| >= 6.0 | 6.0 |
29+
| >= 5.0, < 6.0 | 5.0 |
2930
| >= 2.0, < 5.0 | 1.0 or 2.0 |
3031
| >= 1.0, < 2.0 | 1.0 or 2.0 |
3132
| <= 0.90.x | 0.4 |
3233

33-
- If you are using Elasticsearch 5.0+ , use Elasticsearch-PHP 5.0 branch.
34+
- If you are using Elasticsearch 6.0+ , use Elasticsearch-PHP 6.0 branch.
35+
- If you are using Elasticsearch 5.x , use Elasticsearch-PHP 5.0 branch.
3436
- If you are using Elasticsearch 1.x or 2.x, prefer using the Elasticsearch-PHP 2.0 branch. The 1.0 branch is compatible however.
3537
- If you are using a version older than 1.0, you must install the `0.4` Elasticsearch-PHP branch. Since ES 0.90.x and below is now EOL, the corresponding `0.4` branch will not receive any more development or bugfixes. Please upgrade.
3638
- You should never use Elasticsearch-PHP Master branch, as it tracks Elasticearch master and may contain incomplete features or breaks in backwards compat. Only use ES-PHP master if you are developing against ES master for some reason.
@@ -48,7 +50,7 @@ The recommended method to install _Elasticsearch-PHP_ is through [Composer](http
4850
```json
4951
{
5052
"require": {
51-
"elasticsearch/elasticsearch": "~5.0"
53+
"elasticsearch/elasticsearch": "~6.0"
5254
}
5355
}
5456
```
@@ -82,11 +84,12 @@ You can find out more on how to install Composer, configure autoloading, and oth
8284

8385
PHP Version Requirement
8486
----
85-
Version 5.0 of this library requires at least PHP version 5.6.6 to function. In addition, it requires the native JSON
87+
Version 6.0 of this library requires at least PHP version 7.0.0 to function. In addition, it requires the native JSON
8688
extension to be version 1.3.7 or higher.
8789

8890
| Elasticsearch-PHP Branch | PHP Version |
8991
| ----------- | ------------------------ |
92+
| 6.0 | >= 7.0.0 |
9093
| 5.0 | >= 5.6.6 |
9194
| 2.0 | >= 5.4.0 |
9295
| 0.4, 1.0 | >= 5.3.9 |

Diff for: docs/breaking-changes.asciidoc

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
1-
== Breaking changes from 2.x
2-
3-
- Indices/Analyze Endpoint: `filters` and `char_filters` URI parameters have renamed to `filter` and `char_filter` respectively
4-
- SearchExists endpoint has been removed (use `size=0` and `terminate_after=1` instead)
5-
- Warmers have been removed because they are no longer useful
6-
- Indices/Optimize Endpoint has been removed (use `_forcemerge` instead)
7-
- MoreLikeThis (MLT) endpoint has been removed
8-
- DeleteByQuery endpoint has been removed.
9-
- Tasks/List and Tasks/Get are now separate endpoints (see: link:https://github.com/elasticsearch/elasticsearch-php/commit/752d5a2[e0cc5f9])
10-
- Client requires PHP 5.6.6 or higher
11-
12-
=== Deprecations
13-
14-
- Percolator endpoints are deprecated and will be removed in Elasticsearch 6.0
15-
16-
=== Internal BWC Breaks
17-
18-
- Namespace injection has changed slightly. If you use custom namespaces, you'll need to update your code (see: Add better ability to inject namespaces link:https://github.com/elasticsearch/elasticsearch-php/commit/b1a27b7[b1a27b7])
19-
- Endpoints no longer use the Transport directly. If you use custom endpoints, you'll need to do some minor
20-
refactoring (see: Refactor to remove Transport dependence in endpoints link:https://github.com/elasticsearch/elasticsearch-php/commit/ecd454c[ecd454c])
21-
- To facilitate testing and other features, the `ConnectionInterface` has expanded to obtain some more methods (link:https://github.com/elasticsearch/elasticsearch-php/commit/8bcf1a8[getPath()], link:https://github.com/elasticsearch/elasticsearch-php/commit/586fbdb[getUserPass()], link:https://github.com/elasticsearch/elasticsearch-php/commit/445fdea[getHost()])
1+
== Breaking changes from 5.x

Diff for: docs/installation.asciidoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Elasticsearch-php only has a three requirements that you need to worry about:
44

5-
* PHP 5.6.6 or higher
5+
* PHP 7.0.0 or higher
66
* http://getcomposer.org[Composer]
77
* http://php.net/manual/en/book.curl.php[ext-curl]: the Libcurl extension for PHP (see note below)
88
* Native JSON Extensions (`ext-json`) 1.3.7 or higher
@@ -26,7 +26,8 @@ The master branch will always track Elasticsearch master, but it is not recommen
2626
[width="40%",options="header",frame="topbot"]
2727
|============================
2828
|Elasticsearch Version | Elasticsearch-PHP Branch
29-
| >= 5.0 | `5.0`
29+
| >= 6.0 | `6.0`
30+
| >= 5.0, <= 6.0 | `5.0`
3031
| >= 1.0, <= 5.0 | `1.0`, `2.0`
3132
| <= 0.90.* | `0.4`
3233
|============================
@@ -39,7 +40,7 @@ The master branch will always track Elasticsearch master, but it is not recommen
3940
--------------------------
4041
{
4142
"require": {
42-
"elasticsearch/elasticsearch": "~5.0"
43+
"elasticsearch/elasticsearch": "~6.0"
4344
}
4445
}
4546
--------------------------

0 commit comments

Comments
 (0)