Merge from 8.0

Author: ezimuel

.ci/Dockerfile

@@ -1,22 +1,24 @@
-ARG PHP_VERSION=7.4-cli
+ARG PHP_VERSION=8.0-cli
 FROM php:${PHP_VERSION}
 
 WORKDIR /usr/src/app
 
 # Install git
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends git
+RUN apt-get update -qq > /dev/null && \
+    apt-get install -y --no-install-recommends git -qq > /dev/null
 
 # Install zip extension for PHP
 RUN apt-get install -y \
         libzip-dev \
         zip \
         libyaml-dev \
-    && docker-php-ext-install zip 
+        -qq > /dev/null \
+    && docker-php-ext-install zip > /dev/null
 
 # Install yaml extension for PHP
-RUN pecl channel-update pecl.php.net
-RUN pecl install yaml && docker-php-ext-enable yaml
+RUN pecl channel-update pecl.php.net > /dev/null
+RUN pecl install yaml > /dev/null 
+RUN docker-php-ext-enable yaml > /dev/null
 
 # Print PHP version
 RUN php -v
@@ -30,7 +32,7 @@ RUN composer --version
 COPY composer.json .
 
 # Install dependencies with composer
-RUN composer install
+RUN composer install --no-progress > /dev/null
 
 COPY . .
 

.ci/docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.4-cli
+ARG PHP_VERSION=8.0-cli
 FROM php:${PHP_VERSION}
 
 # Create app directory

.ci/run-elasticsearch.sh

@@ -7,7 +7,7 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.6.0
+# Version 1.6.1
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
@@ -20,6 +20,7 @@
 # - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
 # - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default"
 # - Use https only when TEST_SUITE is "platinum", when "free" use http
+# - Set xpack.security.enabled=false for "free" and xpack.security.enabled=true for "platinum"
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -34,7 +35,6 @@ cluster_name=${moniker}${suffix}
 declare -a volumes
 environment=($(cat <<-END
   --env ELASTIC_PASSWORD=$elastic_password
-  --env xpack.security.enabled=false
   --env node.name=$es_node_name
   --env cluster.name=$cluster_name
   --env cluster.initial_master_nodes=$master_node_name
@@ -73,6 +73,7 @@ END
 ))
 else
   environment+=($(cat <<-END
+    --env xpack.security.enabled=false
     --env xpack.security.http.ssl.enabled=false
 END
 ))
@@ -88,7 +89,7 @@ fi
 docker_pull_attempts=0
 until [ "$docker_pull_attempts" -ge 5 ]
 do
-   docker pull docker.elastic.co/elasticsearch/"$elasticsearch_container" && break
+   docker pull -q docker.elastic.co/elasticsearch/"$elasticsearch_container" && break
    docker_pull_attempts=$((docker_pull_attempts+1))
    echo "Failed to pull image, retrying in 10 seconds (retry $docker_pull_attempts/5)..."
    sleep 10
@@ -127,7 +128,7 @@ END
     --ulimit memlock=-1:-1 \
     --detach="$local_detach" \
     --health-cmd="curl $cert_validation_flags --fail $elasticsearch_url/_cluster/health || exit 1" \
-    --health-interval=2s \
+    --health-interval=5s \
     --health-retries=20 \
     --health-timeout=2s \
     --rm \

.ci/run-repository.sh

@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 
-PHP_VERSION=${PHP_VERSION-7.4-cli}
+PHP_VERSION=${PHP_VERSION-8.0-cli}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 

.ci/test-matrix.yml

@@ -1,11 +1,11 @@
 ---
 STACK_VERSION:
-  - 8.0.0-SNAPSHOT
+  - 8.0-SNAPSHOT
 
 PHP_VERSION:
+  - 8.1-cli
   - 8.0-cli
   - 7.4-cli
-  - 7.3-cli
 
 TEST_SUITE:
   - free

.gitattributes

@@ -5,11 +5,8 @@
 /util export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.gitmodules export-ignore
-/.php_cs export-ignore
 /phpstan.neon export-ignore
 /phpunit-integration-tests.xml export-ignore
 /phpunit-yaml-free-tests.xml export-ignore
 /phpunit-yaml-platinum-tests.xml export-ignore
 /phpunit.xml.dist export-ignore
-/ruleset.xml export-ignore

.github/license-header.txt

@@ -1,13 +1,11 @@
 /**
- * Elasticsearch PHP client
+ * Elasticsearch PHP Client
  *
- * @link      https://github.com/elastic/elasticsearch-php/
+ * @link      https://github.com/elastic/elasticsearch-php
  * @copyright Copyright (c) Elasticsearch B.V (https://www.elastic.co)
- * @license   http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @license   https://www.gnu.org/licenses/lgpl-2.1.html GNU Lesser General Public License, Version 2.1
+ * @license   https://opensource.org/licenses/MIT MIT License
  *
  * Licensed to Elasticsearch B.V under one or more agreements.
- * Elasticsearch B.V licenses this file to you under the Apache 2.0 License or
- * the GNU Lesser General Public License, Version 2.1, at your option.
+ * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */

.github/workflows/test.yml

@@ -9,9 +9,9 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [7.3, 7.4, 8.0]
+        php-version: [7.4, 8.0, 8.1]
         os: [ubuntu-latest]
-        es-version: [8.0.0-SNAPSHOT]
+        es-version: [8.0-SNAPSHOT]
 
     steps:
     - name: Checkout
@@ -40,19 +40,13 @@ jobs:
       run: |
         composer install --prefer-dist
 
-    - name: PHP Coding Standards
-      run: |
-        composer run-script phpcs
-
     - name: PHP Static Analysis Tool
       run: |
         composer run-script phpstan
 
     - name: Unit tests
       run: |
-        vendor/bin/phpunit -c phpunit.xml.dist
-      env:
-        TEST_SUITE: free
+        composer run-script test
 
     - name: Configure sysctl limits
       run: |
@@ -68,7 +62,6 @@ jobs:
 
     - name: Integration tests
       run: |
-        vendor/bin/phpunit -c phpunit-integration-tests.xml
+        composer run-script integration-test   
       env:
-        ELASTICSEARCH_URL: http://localhost:9200
-        
+        TEST_SUITE: free

.gitignore

@@ -45,7 +45,7 @@ build
 tests/*-junit.xml
 
 # YAML tests
-tests/Elasticsearch/Tests/Yaml
+tests/Yaml
 
 # Exclude .ci/make.sh artifcats
 .ci/output

.php_cs

@@ -1,3 +1,55 @@
+# 8.0
+
+This major release is a complete new PHP client for Elasticsearch. We build it from scratch!
+We tried to reduce the BC breaks as much as possible but there are some (big) differences: 
+
+## Architectural changes:
+
+- we changed the namespace, now everything is under `Elastic\Elasticsearch`
+- we used the [elastic-transport-php](https://github.com/elastic/elastic-transport-php) library for HTTP communications;
+- we changed the `Exception` model, using the namespace `Elastic\Elasticsearch\Exception`. All the exceptions extends the
+  `ElasticsearchException` interface, as in 7.x
+- we changed the response type of each endpoints using an [Elasticsearch](src/Response/Elasticsearch.php) response class.
+  This class wraps a a [PSR-7](https://www.php-fig.org/psr/psr-7/) response allowing the access of the body response
+  as array or object. This means you can access the API response as in 7.x, no BC break here! :angel:
+- we changed the `ConnectionPool` in `NodePool`. The `connection` naming was ambigous since the objects are nodes (hosts)
+
+## Specific changes:
+
+The following functions has been removed:
+
+- `ClientBuilder::getEndpoint()`
+- `ClientBuilder::getRegisteredNamespacesBuilders()`
+- `ClientBuilder::getRegisteredNamespacesBuilders()`
+- `ClientBuilder::defaultHandler()`
+- `ClientBuilder::multiHandler()`
+- `ClientBuilder::singleHandler()`
+- `ClientBuilder::setConnectionFactory()`
+- `ClientBuilder::setConnectionPool()`, you can use `ClientBuilder::setNodePool` instead
+- `ClientBuilder::setEndpoint()`
+- `ClientBuilder::registerNamespace()`
+- `ClientBuilder::setTransport()`, you can specify an HTTP PSR-18 client using `ClientBuilder::setHttpClient()`
+- `ClientBuilder::setHandler()`
+- `ClientBuilder::setTracer()`, you can only set a Logger using  `ClientBuilder::setLogger()`
+- `ClientBuilder::setSerializer()`
+- `ClientBuilder::setConnectionParams()`, you can use `ClientBuilder::setHttpClientOptions()` instead
+- `ClientBuilder::setSelector()`, you can set a `Selector` using the `setNodePool`, see [here](https://github.com/elastic/elastic-transport-php/blob/8.x/README.md#use-a-custom-selector) for more information
+- `ClientBuilder::setSniffOnStart()`
+- `ClientBuilder::includePortInHostHeader()`
+
+We removed the special `client` parameter passed in `$params` endpoints. In details: 
+
+- `$params['client']['never_retry']`
+- `$params['client']['verbose']`
+- `$params['client']['port_in_header']`
+- `$params['client']['future']`, you can set HTTP async using `Client::setAsync(true)`
+- `$params['client']['ignore']`, you can disable the Exception using `Client::setResponseException(false)`
+
+# 7.17
+
+- We changed the signature of `Elasticsearch\Common\EmptyLogger::log` adding the `void` return type.
+  This change has been needed to support psr/log v3.
+
 # 7.4
 
 - Using a deprecated parameter is notified triggering a [E_USER_DEPRECATED](https://www.php.net/manual/en/errorfunc.constants.php)

BREAKING_CHANGES.md

@@ -1,3 +1,48 @@
+## Release 8.0.0
+
+- Finally the 8.0.0 GA for [Elasticsearch 8](https://www.elastic.co/blog/whats-new-elastic-8-0-0).
+
+## Release 8.0.0-rc2
+
+- Added the common parameters in all the endpoints
+  [6427f8c](https://github.com/elastic/elasticsearch-php/commit/6427f8c42ba2afbe82c00adffdf93dd60b439432)
+
+## Release 8.0.0-rc1
+
+- Fixed query string in API endpoints + added a first integration test
+  [e404235](https://github.com/elastic/elasticsearch-php/commit/e404235890b53a99242f7fc5ddea6ee6b2459e8f)
+- Added AdapterOptions class and setNodePool() in ClientBuilder
+  [9150f71](https://github.com/elastic/elasticsearch-php/commit/9150f717488ddb74d83a119d215c0584aa98c95a)
+- Fixed urlencode in params, Exception in test code generation
+  [142327b](https://github.com/elastic/elasticsearch-php/commit/142327b3cb730042ec0b21b7c6076164bb0721ed)
+- Improved client/server response exception messages
+  [50de3e6](https://github.com/elastic/elasticsearch-php/commit/50de3e60fc9b0167a948a992fda78bc5e1a42152)
+
+## Release 8.0.0-alpha
+
+First alpha release of elasticsearch-php 8.0.0.
+
+This major release is a complete new PHP client for Elasticsearch. We build it from scratch!
+We tried to reduce the BC breaks as much as possible but there are some (big) differences: 
+
+### Architectural changes:
+
+- we changed the namespace, now everything is under `Elastic\Elasticsearch`
+- we used the [elastic-transport-php](https://github.com/elastic/elastic-transport-php) library for HTTP communications;
+- we changed the `Exception` model, using the namespace `Elastic\Elasticsearch\Exception`. All the exceptions extends the
+  `ElasticsearchException` interface, as in 7.x
+- we changed the response type of each endpoints using an [Elasticsearch](src/Response/Elasticsearch.php) response class.
+  This class wraps a a [PSR-7](https://www.php-fig.org/psr/psr-7/) response allowing the access of the body response
+  as array or object. This means you can access the API response as in 7.x, no BC break here! :angel:
+- we changed the `ConnectionPool` in `NodePool`. The `connection` naming was ambigous since the objects are nodes (hosts)
+
+You can have a look at the [BREAKING_CHANGES](BREAKING_CHANGES.md) file for more information.
+
+## Release 7.17.0
+
+- Allow psr/log v3
+  [#1184](https://github.com/elastic/elasticsearch-php/pull/1184)
+
 ## Release 7.16.0
 
 - Added support of includePortInHostHeader in ClientBuilder::fromConfig

CHANGELOG.md

@@ -1,6 +1,19 @@
-Copyright 2013-2020 Elasticsearch B.V.
+Copyright 2022 Elasticsearch B.V (https://www.elastic.co)
 
-elasticsearch-php is licensed under the Apache License, Version 2.0
-(<LICENSE-APACHE> or <http://www.apache.org/licenses/LICENSE-2.0>) or the GNU
-Lesser General Public License, Version 2.1 (<LICENSE-LGPL> or
-<https://www.gnu.org/licenses/lgpl-2.1.html>) at your option.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.