From 43dc1cd41221cdd4a6f8bfc19fa85c65d028d3d8 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 29 Oct 2021 13:26:16 +0100 Subject: [PATCH] Document that 6.x (>= 6.2.0) supports PHP 8.0 (#1989) (#2007) --- README.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index cbdfdb4693..6455701a47 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,19 @@ Contributions are always welcome. For details on how to contribute, check the [C Versions & Dependencies ------------ -This project tries to follow Elasticsearch in terms of [End of Life](https://www.elastic.co/support/eol) and maintenance since 5.x - -| Elastica | ElasticSearch | elasticsearch-php | PHP | -| --------------------------------------------------------------------------------------- | ------------- | ----------------- | -------------- | -| [7.x](https://github.com/ruflin/Elastica/tree/master) | 7.x | ^7.0 | ^7.2 \|\| ^8.0 | -| [7.0](https://github.com/ruflin/Elastica/tree/7.0) | 7.x | ^7.0 | ^7.2 | -| [6.x](https://github.com/ruflin/Elastica/tree/6.x) | 6.x | ^6.0 | ^7.0 | -| [5.x](https://github.com/ruflin/Elastica/tree/5.x) (unmaintained) | 5.x | ^5.0 | \>=5.6 | -| [3.2.3](https://github.com/ruflin/Elastica/tree/3.2.3) (unmaintained) | 2.4.0 | no | \>=5.4 | -| [2.x](https://github.com/ruflin/Elastica/tree/2.x) (unmaintained) | 1.7.2 | no | \>=5.3.3 | +This project tries to follow Elasticsearch in terms of [End of Life](https://www.elastic.co/support/eol) and maintenance since 5.x. +It is generally recommended to use the latest point release of the relevant branch. + +| Elastica branch | ElasticSearch | elasticsearch-php | PHP | +| ----------------------------------------------------- | ------------- | ----------------- | -------------- | +| [7.x](https://github.com/ruflin/Elastica/tree/master) | 7.x | ^7.0 | ^7.2 \|\| ^8.0 | +| [6.x](https://github.com/ruflin/Elastica/tree/6.x) | 6.x | ^6.0 | ^7.0 \|\| ^8.0 | + +Unmaintained versions: + +| Elastica version | ElasticSearch | elasticsearch-php | PHP | +| ----------------------------------------------------- | ------------- | ----------------- | -------------- | +| [5.x](https://github.com/ruflin/Elastica/tree/5.x) | 5.x | ^5.0 | \>=5.6 | +| [3.x](https://github.com/ruflin/Elastica/tree/3.x) | 2.4.0 | no | \>=5.4 | +| [2.x](https://github.com/ruflin/Elastica/tree/2.x) | 1.7.2 | no | \>=5.3.3 | ------------