Fix integration tests using docker

Author: ezimuel

.gitignore

@@ -21,9 +21,12 @@ Thumbs.db
 generator/*
 
 # Elasticsearch related
-util/elasticsearch/
+util/elasticsearch
 util/cache/
 util/output
 
 # Sami docs generator
 /sami.phar
+
+# PHPUnit
+/phpunit.xml

.travis.yml

@@ -1,12 +1,7 @@
 language: php
 
-jdk:
-  - oraclejdk8
-
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
+services:
+  - docker
 
 branches:
   except:
@@ -43,11 +38,9 @@ matrix:
 env:
   global:
     - ES_TEST_HOST=http://localhost:9200
-    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
 
 before_install:
-  - sudo update-java-alternatives -s java-8-oracle
-  - ./travis/download_and_run_es.sh
+  - ./travis/run_es_docker.sh
 
 install:
   - composer install --prefer-dist
@@ -65,3 +58,6 @@ script:
 
 after_script:
   - if [ $TRAVIS_PHP_VERSION = '7.3' ]; then php vendor/bin/coveralls; fi
+
+notifications:
+  email: true

composer.json

@@ -6,7 +6,10 @@
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Zachary Tong"
+        "name": "Zachary Tong"
+    },
+    {
+        "name": "Enrico Zimuel"
     }
   ],
   "require": {
@@ -18,8 +21,8 @@
   "require-dev": {
     "cpliakas/git-wrapper": "~1.0",
     "doctrine/inflector": "^1.1",
-    "mockery/mockery": "0.9.4",
-    "phpstan/phpstan-shim": "0.9.1",
+    "mockery/mockery": "^1.2",
+    "phpstan/phpstan-shim": "^0.9",
     "phpunit/phpunit": "6.3.0",
     "squizlabs/php_codesniffer": "3.0.2",
     "symfony/finder": "^2.8",
@@ -36,7 +39,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Elasticsearch\\Tests\\":      "tests/Elasticsearch/Tests/"
+      "Elasticsearch\\Tests\\": "tests/Elasticsearch/Tests/",
+      "Elasticsearch\\IntegrationTests\\": "tests/Elasticsearch/IntegrationTests/"
     }
   },
   "config": {
@@ -48,8 +52,7 @@
       "phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp tests"
     ],
     "phpstan": [
-      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress",
-      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-tests.neon tests --level 7 --no-progress"
+      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress"
     ]
   }
 }

phpunit.xml renamed to phpunit.xml.dist

@@ -9,7 +9,7 @@
         beStrictAboutOutputDuringTests="true"
 >
     <php>
-        <server name="ES_TEST_HOST" value="http://localhost:9200"/>
+        <env name="ES_TEST_HOST" value=""/>
     </php>
     <testsuites>
         <testsuite name="Tests">