Fix tests for PHP 7 with ES 6.7 + updated versions req in docs

Author: ezimuel

README.md

@@ -29,7 +29,8 @@ Version Matrix
 
 | Elasticsearch Version | Elasticsearch-PHP Branch |
 | --------------------- | ------------------------ |
-| >= 6.0, < 7.0         | 6.0                      |
+| >= 6.6, < 7.0         | 6.7                      |
+| >= 6.0, < 6.6         | 6.5                      |
 | >= 5.0, < 6.0         | 5.0                      |
 | >= 2.0, < 5.0         | 1.0 or 2.0               |
 | >= 1.0, < 2.0         | 1.0 or 2.0               |
@@ -49,12 +50,12 @@ Installation via Composer
 -------------------------
 The recommended method to install _Elasticsearch-PHP_ is through [Composer](http://getcomposer.org).
 
-1. Add `elasticsearch/elasticsearch` as a dependency in your project's `composer.json` file (change version to suit your version of Elasticsearch, for instance this is for ES 6.0 to 6.5):
+1. Add `elasticsearch/elasticsearch` as a dependency in your project's `composer.json` file (change version to suit your version of Elasticsearch, for instance for ES 6.7):
 
     ```json
         {
             "require": {
-                "elasticsearch/elasticsearch": "^6.5"
+                "elasticsearch/elasticsearch": "^6.7"
             }
         }
     ```

docs/installation.asciidoc

@@ -27,7 +27,8 @@ The master branch will always track Elasticsearch master, but it is not recommen
 [width="40%",options="header",frame="topbot"]
 |============================
 |Elasticsearch Version | Elasticsearch-PHP Branch
-| >= 6.0                | `6.0`
+| >= 6.6, <= 6.7        | `6.7`
+| >= 6.0, <= 6.5        | `6.5`
 | >= 5.0, <= 6.0        | `5.0`
 | >= 1.0, <= 5.0        | `1.0`, `2.0`
 | <= 0.90.*             | `0.4`
@@ -41,7 +42,7 @@ The master branch will always track Elasticsearch master, but it is not recommen
 --------------------------
 {
     "require": {
-        "elasticsearch/elasticsearch": "~6.0"
+        "elasticsearch/elasticsearch": "~6.7.0"
     }
 }
 --------------------------

tests/Elasticsearch/Tests/YamlRunnerTest.php

@@ -68,9 +68,17 @@ class YamlRunnerTest extends \PHPUnit\Framework\TestCase
     private static $skippedTests = [
         'nodes.stats/30_discovery.yml#Discovery stats' => 'Failing on ES 6.1+: nodes.$master.discovery is an empty array, expected to have cluster_state_queue field in it',
         'indices.stats/20_translog.yml#Translog retention' => 'Failing on ES 6.3+: Failed asserting that 495 is equal to <string:$creation_size> or is less than \'$creation_size\'',
-        'indices.shrink/30_copy_settings.yml#Copy settings during shrink index' => 'Failing on ES 6.4+: Failed to match in test "Copy settings during shrink index". Expected [\'4\'] does not match [false] '
+        'indices.shrink/30_copy_settings.yml#Copy settings during shrink index' => 'Failing on ES 6.4+: Failed to match in test "Copy settings during shrink index". Expected [\'4\'] does not match [false] ',
     ];
 
+    private static $skippedTestsIfPhpLessThan = [
+        // Failing on ES 6.7+ only with PHP 7.0: Cannot access empty property
+        'indices.put_mapping/11_basic_with_types.yml#Create index with invalid mappings' => '7.1.0',
+        'indices.put_mapping/10_basic.yml#Create index with invalid mappings' => '7.1.0',
+        'indices.create/11_basic_with_types.yml#Create index with invalid mappings' => '7.1.0',
+        'indices.create/11_basic_with_types.yml#Create index with no type mappings' => '7.1.0',
+        'indices.create/10_basic.yml#Create index with invalid mappings' => '7.1.0',
+    ];
     /**
      * @var array A list of skipped test with their reasons
      */
@@ -814,8 +822,8 @@ public function yamlProvider(): array
         $filter = getenv('TEST_CASE') !== false ? getenv('TEST_CASE') : null;
 
         /**
- * @var SplFileInfo $file
-*/
+         * @var SplFileInfo $file
+         */
         foreach ($finder as $file) {
             $files = array_merge($files, $this->splitDocument($file, $path, $filter));
         }
@@ -944,6 +952,7 @@ private function formatRegex(string $regex): string
      */
     private function splitDocument(SplFileInfo $file, string $path, string $filter = null): array
     {
+
         $fileContent = $file->getContents();
         // cleanup some bad comments
         $fileContent = str_replace('"#', '" #', $fileContent);
@@ -973,6 +982,17 @@ function ($item) {
         $skip = false;
         $documentParsed = null;
         foreach ($documents as $documentString) {
+            // Extract test name
+            if (preg_match('/"([^"]+)"/', $documentString, $matches)) {
+                $testName = $matches[1];
+                // Skip YAML parsing if test is signed to be skipped and if PHP is < version specified
+                // To prevent YAML parse error, e.g. empty property
+                if (array_key_exists("$fileName#$testName", static::$skippedTestsIfPhpLessThan)) {
+                    if (version_compare(PHP_VERSION, static::$skippedTestsIfPhpLessThan["$fileName#$testName"], '<')) {
+                        continue;
+                    }
+                }
+            }
             // TODO few bad instances of teardown, should be fixed in upstream but this is a quick fix locally
             $documentString = str_replace(" teardown:", "teardown:", $documentString);
             try {