Merge branch '1.x' of https://github.com/handcraftedinthealps/ElasticsearchBundle into 5.x

 Conflicts:
	.travis.yml
	composer.json

Author: alexander-schranz

.coveralls.yml

@@ -1,3 +1,3 @@
-coverage_clover: coveralls.clover
-service_name: travis-ci
+coverage_clover: coverage.clover
 json_path: ./coveralls.json
+repo_token: PpZCCrM6aBtU9l5xdzeOFj8bakIcaJqgD

.github/workflows/test-application.yaml

@@ -0,0 +1,122 @@
+name: Test application
+
+on:
+    pull_request:
+    push:
+        branches:
+            - '[0-9]+.[0-9]+'
+            - '[0-9]+.x'
+
+jobs:
+    php:
+        name: 'Run tests with php ${{ matrix.php-version }}'
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - php-version: '5.6'
+                      lint: false
+                      symfony-version: '^2.8'
+                      elasticsearch-package-constraint: '^5.0' 
+                      env:
+                          ELASTICSEARCH_HOST: '127.0.0.1:9205'
+
+                    - php-version: '7.0'
+                      lint: false
+                      symfony-version: '^3.4'
+                      elasticsearch-package-constraint: '^5.0' 
+                      env:
+                          ELASTICSEARCH_HOST: '127.0.0.1:9205'
+
+                    - php-version: '7.2'
+                      lint: false
+                      symfony-version: '^3.4'
+                      elasticsearch-package-constraint: '^5.0' 
+                      env:
+                          ELASTICSEARCH_HOST: '127.0.0.1:9205'
+
+                    - php-version: '7.3'
+                      lint: false
+                      symfony-version: '^4.4'
+                      elasticsearch-package-constraint: '^5.0' 
+                      env:
+                          ELASTICSEARCH_HOST: '127.0.0.1:9205'
+
+                    - php-version: '7.4'
+                      lint: true
+                      symfony-version: '^5.0'
+                      elasticsearch-package-constraint: '^5.0' 
+                      env:
+                          ELASTICSEARCH_HOST: '127.0.0.1:9205'
+
+        services:
+            elasticsearch5:
+                image: elasticsearch:5.6.14
+                ports:
+                    - 9205:9200
+                env:
+                    discovery.type: 'single-node'
+                    xpack.security.enabled: 'false'
+                options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5
+
+            elasticsearch6:
+                image: elasticsearch:6.8.4
+                ports:
+                    - 9206:9200
+                env:
+                    discovery.type: 'single-node'
+                    xpack.security.enabled: 'false'
+                options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5
+
+            elasticsearch7:
+                image: elasticsearch:7.9.3
+                ports:
+                    - 9202:9200
+                env:
+                    discovery.type: 'single-node'
+                    xpack.security.enabled: 'false'
+                options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5
+
+        steps:
+            - name: Checkout project
+              uses: actions/checkout@v2
+
+            - name: Install and configure PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: 'composer'
+
+            - name: Get composer cache directory
+              id: composer-cache-dir
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: Cache dependencies
+              uses: actions/cache@v2
+              id: composer-cache
+              with:
+                  path: ${{ steps.composer-cache-dir.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('composer.json', 'composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-composer-
+
+            - name: Install dependencies
+              run: |
+                  composer validate
+                  composer require --no-update symfony/symfony:${{ matrix.symfony-version }}
+                  composer require --no-update elasticsearch/elasticsearch:${{ matrix.elasticsearch-package-constraint }}
+                  composer install --no-interaction --prefer-dist
+
+            - name: Fix code style
+              if: ${{ matrix.lint }}
+              run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/ ./
+
+            - name: Run tests
+              run: vendor/bin/simple-phpunit --coverage-clover=coverage.clover
+
+            - name: Upload coverage results to Coveralls
+              run: vendor/bin/php-coveralls -v
+              env:
+                  COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

composer.json

@@ -31,7 +31,6 @@
     "require-dev": {
         "mikey179/vfsstream": "~1.4",
         "squizlabs/php_codesniffer": "~2.0",
-        "satooshi/php-coveralls": "~1.0 || ~2.0",
         "symfony/browser-kit" : "^2.8|^3.4|^4|^5",
         "symfony/expression-language" : "^2.8|^3.4|^4|^5",
         "symfony/twig-bundle": "^2.8|^3.4|^4|^5",
@@ -41,7 +40,7 @@
         "symfony/dependency-injection": "^2.8|^3.4|^4|^5",
         "symfony/validator": "^2.8|^3.4|^4|^5",
         "symfony/options-resolver": "^2.8|^3.4|^4|^5",
-        "symfony/var-dumper": "^2.8|^3.4|^4|^5"
+        "php-coveralls/php-coveralls": "^2.4.3"
     },
     "autoload": {
         "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },