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,11 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
+<<<<<<< HEAD
 # Version 1.6.0
+=======
+# Version 1.6.1
+>>>>>>> elasticsearch-php/8.0
 # - 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 +24,10 @@
 # - 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
+<<<<<<< HEAD
+=======
+# - Set xpack.security.enabled=false for "free" and xpack.security.enabled=true for "platinum"
+>>>>>>> elasticsearch-php/8.0
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -34,7 +42,10 @@ cluster_name=${moniker}${suffix}
 declare -a volumes
 environment=($(cat <<-END
   --env ELASTIC_PASSWORD=$elastic_password
+<<<<<<< HEAD
   --env xpack.security.enabled=false
+=======
+>>>>>>> elasticsearch-php/8.0
   --env node.name=$es_node_name
   --env cluster.name=$cluster_name
   --env cluster.initial_master_nodes=$master_node_name
@@ -73,6 +84,10 @@ END
 ))
 else
   environment+=($(cat <<-END
+<<<<<<< HEAD
+=======
+    --env xpack.security.enabled=false
+>>>>>>> elasticsearch-php/8.0
     --env xpack.security.http.ssl.enabled=false
 END
 ))
@@ -88,7 +103,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 +142,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,12 +1,11 @@
 ---
 STACK_VERSION:
-  - 8.0.0-SNAPSHOT
+  - 8.x-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, 8.1]
+        php-version: [7.4, 8.0, 8.1]
         os: [ubuntu-latest]
-        es-version: [8.0.0-SNAPSHOT]
+        es-version: [8.x-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