Merge branch 'mhujer-mh-es-6'

Fixed conflicts, and removed the allowed failure for 6.x
(we shouldn't be failing 6.x, so failures here shouldn't be ignored)

Author: polyfractal

.travis.yml

@@ -14,24 +14,25 @@ branches:
 
 sudo: true
 
-php:
-  - 7.0
-  - 7.1
-
 matrix:
   fast_finish: true
   include:
+    - php: 7.0
+      env: ES_VERSION="5.5" TEST_BUILD_REF="origin/5.5"
+    - php: 7.0
+      env: ES_VERSION="6.0" TEST_BUILD_REF="origin/6.0"
+    - php: 7.0
+      env: ES_VERSION="6.x" TEST_BUILD_REF="origin/6.x"
+
     - php: 7.1
-      env: ES_VERSION="5.0" TEST_BUILD_REF="origin/5.0"
+      env: ES_VERSION="5.5" TEST_BUILD_REF="origin/5.5"
     - php: 7.1
-      env: ES_VERSION="5.1" TEST_BUILD_REF="origin/5.1"
+      env: ES_VERSION="6.0" TEST_BUILD_REF="origin/6.0"
     - php: 7.1
-      env: ES_VERSION="5.2" TEST_BUILD_REF="origin/5.2"
+      env: ES_VERSION="6.x" TEST_BUILD_REF="origin/6.x"
 
 env:
   global:
-    - ES_VERSION="5.x"
-    - TEST_BUILD_REF="origin/5.x"
     - ES_TEST_HOST=http://localhost:9200
     - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
 

tests/Elasticsearch/Tests/YamlRunnerTest.php

@@ -56,18 +56,35 @@ class YamlRunnerTest extends \PHPUnit_Framework_TestCase
 
     /** @var array A list of skipped test with their reasons */
     private static $skippedTest = [
+        'cat.aliases/20_headers.yml' => 'Using java regex fails in PHP',
+        'cat.aliases/20_headers.yaml' => 'Using java regex fails in PHP',
+
         'cat.nodeattrs/10_basic.yml' => 'Using java regex fails in PHP',
+        'cat.nodeattrs/10_basic.yaml' => 'Using java regex fails in PHP',
+
         'cat.repositories/10_basic.yml' => 'Using java regex fails in PHP',
+        'cat.repositories/10_basic.yaml' => 'Using java regex fails in PHP',
+
         'indices.shrink/10_basic.yml' => 'Shrink tests seem to require multiple nodes',
-        'indices.rollover/10_basic.yml' => 'Rollover test seems buggy atm'
+        'indices.shrink/10_basic.yaml' => 'Shrink tests seem to require multiple nodes',
+
+        'indices.rollover/10_basic.yml' => 'Rollover test seems buggy atm',
+        'indices.rollover/10_basic.yaml' => 'Rollover test seems buggy atm',
     ];
 
     /** @var array A list of files to skip completely, due to fatal parsing errors */
     private static $skippedFiles = [
         'indices.create/10_basic.yml' => 'Temporary: Yaml parser doesnt support "inline" empty keys',
+        'indices.create/10_basic.yaml' => 'Temporary: Yaml parser doesnt support "inline" empty keys',
+
         'indices.put_mapping/10_basic.yml' => 'Temporary: Yaml parser doesnt support "inline" empty keys',
+        'indices.put_mapping/10_basic.yaml' => 'Temporary: Yaml parser doesnt support "inline" empty keys',
+
         'search/110_field_collapsing.yml' => 'Temporary: parse error, malformed inline yaml',
-        'cat.nodes/10_basic.yml' => 'Temporary: parse error, something about $body: |'
+        'search/110_field_collapsing.yaml' => 'Temporary: parse error, malformed inline yaml',
+
+        'cat.nodes/10_basic.yml' => 'Temporary: parse error, something about $body: |',
+        'cat.nodes/10_basic.yaml' => 'Temporary: parse error, something about $body: |',
     ];
 
     /**
@@ -733,6 +750,9 @@ public function yamlProvider()
         $finder->files();
         $finder->name('*.yml');
 
+        // *.yaml files should be included until the library is ES 6.0+ only
+        $finder->name('*.yaml');
+
         $filter = isset($_SERVER['TEST_CASE']) ? $_SERVER['TEST_CASE'] : null;
 
         /** @var SplFileInfo $file */