Merge branch 'master' into json-encode-patch

Author: najdanovicivan

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ The process for contributing to any of the Elasticsearch repositories is similar
 
 1. Sign the contributor license agreement
 
-    Please make sure you have signed the [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
+    Please make sure you have signed the [Contributor License Agreement](https://www.elastic.co/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
 
 2. Set up your fork for development
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,12 @@
 Thanks for the Pull Request!  Before you submit the PR, please
 look over this checklist:
 
-- Have you signed [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/)?
+- Have you signed [Contributor License Agreement](https://www.elastic.co/contributor-agreement)?
 PR's (no matter how small) cannot be merged until the CLA has been signed.  It only needs to be signed once,
 however.
 
 - Have you read the [Contributing Guidelines](https://github.com/elastic/elasticsearch-php/blob/master/.github/CONTRIBUTING.md)?
 
 If you answered yes to both, thanks for the PR and we'll get to it ASAP! :)
 
--->
+-->

.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:
@@ -18,13 +13,13 @@ matrix:
   fast_finish: true
   include:
     - php: 7.0
-      env: ES_VERSION="6.5.0"
+      env: ES_VERSION="6.7.0"
 
     - php: 7.1
-      env: ES_VERSION="6.5.0"
+      env: ES_VERSION="6.7.0"
 
     - php: 7.2
-      env: ES_VERSION="6.5.0"
+      env: ES_VERSION="6.7.0"
 
     - php: 7.3
       env: ES_VERSION="6.0.0"
@@ -38,16 +33,17 @@ matrix:
       env: ES_VERSION="6.4.0"
     - php: 7.3
       env: ES_VERSION="6.5.0"
-
+    - php: 7.3
+      env: ES_VERSION="6.6.0"
+    - php: 7.3
+      env: ES_VERSION="6.7.0"
 
 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 +61,6 @@ script:
 
 after_script:
   - if [ $TRAVIS_PHP_VERSION = '7.3' ]; then php vendor/bin/coveralls; fi
+
+notifications:
+  email: true

BREAKING_CHANGES.md

@@ -1,3 +1,7 @@
+# 6.7
+
+- `{type}` part in `indices.put_mapping` API is not required anymore, see new specification [here](https://github.com/elastic/elasticsearch/blob/v6.7.0/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json)
+
 # 6.0
 
 - [Search Templates]: PutTemplate endpoint has been removed (see [Elasticsearch Breaking Changes](https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking_60_scripting_changes.html#_stored_search_template_apis_removed)),

CHANGELOG.md

@@ -1,3 +1,40 @@
+## Release 6.7.0
+
+- Removed requirement of `{type}` part in `indices.put_mapping`, see new API specification [here](https://github.com/elastic/elasticsearch/blob/v6.7.0/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json)
+- Added `seq_no_primary_term` parameter in `bulk` endpoint [#884](https://github.com/elastic/elasticsearch-php/pull/884)
+- Added `include_type_name`, `if_primary_term`, `if_seq_no` in `delete` endpoint [#884](https://github.com/elastic/elasticsearch-php/pull/884)
+- Added `include_type_name` in `get`, `index`, `indices.create`, `indices.field.get`, `indices.get`, `indices.mapping.get`, `indices.mapping.getfield`, `indices.mapping.put`, `indices.rollover`, `indices.template.get`, `indices.template.put` endpoints [#884](https://github.com/elastic/elasticsearch-php/pull/884)
+- Added `seq_no_primary_term` in `search` endpoint [#884](https://github.com/elastic/elasticsearch-php/pull/884)
+- Added `if_primary_term', 'if_seq_no`in `update` endpoint [#884](https://github.com/elastic/elasticsearch-php/pull/884)
+
+### Testing
+
+- Fix tests for PHP 7 with ES 6.7 [[5401479](https://github.com/elastic/elasticsearch-php/pull/884/commits/5401479)
+
+### Docs
+
+- [DOCS] Fix doc links in README [[5a1782d]](https://github.com/elastic/elasticsearch-php/pull/884/commits/5a1782d)
+
+## Release 6.5.0
+
+- Remove `_suggest` endpoint, which has disappeared from ES6 [#763](https://github.com/elastic/elasticsearch-php/pull/763)
+- Fix `SearchHitIterator` key duplicates [#872](https://github.com/elastic/elasticsearch-php/pull/872)
+- Fixing script get and delete by removing `lang` from endpoint url [#814](https://github.com/elastic/elasticsearch-php/pull/814)
+- Fix `SearchResponseIterator` is scrolling the first page twice [#871](https://github.com/elastic/elasticsearch-php/pull/871), issue [#595](https://github.com/elastic/elasticsearch-php/issues/595)
+
+### Docs
+
+- [DOCS] Add reference to `parse_url()` for Extended Host Configuration [#778](https://github.com/elastic/elasticsearch-php/pull/778)
+- [DOCS] Update php version requirement [#757](https://github.com/elastic/elasticsearch-php/pull/757)
+- [DOCS] Update `community.asciidoc`, added `ElasticSearchQueryDSL` project [#749](https://github.com/elastic/elasticsearch-php/pull/749)
+- [DOCS] Proper return type array for get method for `IndicesNamespace` [#651](https://github.com/elastic/elasticsearch-php/pull/651)
+- [DOCS] Fix full docs link [#862](https://github.com/elastic/elasticsearch-php/pull/862)
+- [DOCS] Update breaking-changes.asciidoc, removal of ClientBuilder::defaultLogger() [879](https://github.com/elastic/elasticsearch-php/pull/879)
+
+### Testing
+
+- Fix integration tests using docker [#867](https://github.com/elastic/elasticsearch-php/pull/867)
+
 ## Release 6.1.0
 
 - Add 'wait_for_no_initializing_shards' to Cluster\Health whitelist [[98a372c]](http://github.com/elasticsearch/elasticsearch-php/commit/98a372c)

README.md

@@ -19,42 +19,44 @@ Features
  - Pluggable connection pools to offer different connection strategies
  - Generalized, pluggable architecture - most components can be replaced with your own custom class if specialized behavior is required
  - Option to use asynchronous future, which enables parallel execution of curl requests to multiple nodes
- 
- 
-**Note:** If you want to use X-Pack API, you need to install an optional extension [elasticsearch/xpack](https://github.com/elastic/elasticsearch-x-pack-php). 
+
+
+**Note:** If you want to use X-Pack API, you need to install an optional extension [elasticsearch/xpack](https://github.com/elastic/elasticsearch-x-pack-php).
 
 
 Version Matrix
 --------------
 
 | Elasticsearch Version | Elasticsearch-PHP Branch |
 | --------------------- | ------------------------ |
-| >= 6.0                | 6.0                      |
+| >= 6.6, < 7.0         | 6.7.x                    |
+| >= 6.0, < 6.6         | 6.5.x                    |
 | >= 5.0, < 6.0         | 5.0                      |
 | >= 2.0, < 5.0         | 1.0 or 2.0               |
 | >= 1.0, < 2.0         | 1.0 or 2.0               |
 | <= 0.90.x             | 0.4                      |
 
- - If you are using Elasticsearch 6.0+ , use Elasticsearch-PHP 6.0 branch.
- - If you are using Elasticsearch 5.x , use Elasticsearch-PHP 5.0 branch.
+ - If you are using Elasticsearch 6.6 to 6.7, use Elasticsearch-PHP 6.7.x branch.
+ - If you are using Elasticsearch 6.0 to 6.5, use Elasticsearch-PHP 6.5.x branch.
+ - If you are using Elasticsearch 5.x, use Elasticsearch-PHP 5.0 branch.
  - If you are using Elasticsearch 1.x or 2.x, prefer using the Elasticsearch-PHP 2.0 branch.  The 1.0 branch is compatible however.
  - If you are using a version older than 1.0, you must install the `0.4` Elasticsearch-PHP branch. Since ES 0.90.x and below is now EOL, the corresponding `0.4` branch will not receive any more development or bugfixes.  Please upgrade.
  - You should never use Elasticsearch-PHP Master branch, as it tracks Elasticsearch master and may contain incomplete features or breaks in backwards compatibility. Only use ES-PHP master if you are developing against ES master for some reason.
 
 Documentation
 --------------
-[Full documentation can be found here.](http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/5.0/index.html)  Docs are stored within the repo under /docs/, so if you see a typo or problem, please submit a PR to fix it!
+[Full documentation can be found here.](https://www.elastic.co/guide/en/elasticsearch/client/php-api/current/index.html)  Docs are stored within the repo under /docs/, so if you see a typo or problem, please submit a PR to fix it!
 
 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):
+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.0"
+                "elasticsearch/elasticsearch": "^6.7"
             }
         }
     ```
@@ -353,7 +355,7 @@ That was just a crash-course overview of the client and its syntax.  If you are
 
 You'll also notice that the client is configured in a manner that facilitates easy discovery via the IDE.  All core actions are available under the `$client` object (indexing, searching, getting, etc.).  Index and cluster management are located under the `$client->indices()` and `$client->cluster()` objects, respectively.
 
-Check out the rest of the [Documentation](http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/index.html) to see how the entire client works.
+Check out the rest of the [Documentation](https://www.elastic.co/guide/en/elasticsearch/client/php-api/current/index.html) to see how the entire client works.
 
 
 Available Licenses

composer.json

@@ -6,7 +6,10 @@
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Zachary Tong"
+        "name": "Zachary Tong"
+    },
+    {
+        "name": "Enrico Zimuel"
     }
   ],
   "require": {
@@ -16,12 +19,12 @@
     "psr/log": "~1.0"
   },
   "require-dev": {
-    "cpliakas/git-wrapper": "~1.0",
+    "cpliakas/git-wrapper": "^1.7 || ^2.1",
     "doctrine/inflector": "^1.1",
-    "mockery/mockery": "0.9.4",
-    "phpstan/phpstan-shim": "0.9.1",
-    "phpunit/phpunit": "6.3.0",
-    "squizlabs/php_codesniffer": "3.0.2",
+    "mockery/mockery": "^1.2",
+    "phpstan/phpstan-shim": "^0.9 || ^0.11",
+    "phpunit/phpunit": "^5.7 || ^6.5",
+    "squizlabs/php_codesniffer": "^3.4",
     "symfony/finder": "^2.8",
     "symfony/yaml": "^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"
     ]
   }
 }

docs/breaking-changes.asciidoc

@@ -1,4 +1,17 @@
 [[breaking_changes]]
 == Breaking changes from 5.x
 
-None! :)
+### Removal of ClientBuilder::defaultLogger()
+
+In 5.x there is the ability to create a default Logger object, which has been removed. It is now required to explicitly make a Logger object.
+
+5.x
+```
+$logger = ClientBuilder::defaultLogger('path_to_log_file');
+```
+
+6.5
+```
+$logger = new Logger('name');
+$logger->pushHandler(new StreamHandler('path_to_log_file', Logger::WARNING);
+```

docs/build/Elasticsearch/Client.asciidoc

@@ -931,7 +931,6 @@ $response = $client->updateByQuery($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 
@@ -953,7 +952,6 @@ $response = $client->getScript($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 
@@ -975,7 +973,6 @@ $response = $client->deleteScript($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 

docs/community.asciidoc

@@ -18,6 +18,15 @@ __________________________
 This agnostic package is a lightweight wrapper on top of the Elasticsearch PHP client. Its main goal is to allow for easier structuring of queries and indices in your application. It does not want to hide or replace functionality of the Elasticsearch PHP client.
 __________________________
 
+=== ElasticSearchQueryDSL
+
+https://github.com/gskema/elasticsearch-query-dsl-php[Link: ElasticSearchQueryDSL]
+
+[quote, ElasticSearchQueryDSL]
+__________________________
+Feature complete, object oriented, composable, extendable ElasticSearch query DSL builder for PHP. Deliberately built to be as simple as possible, easily usable and with explicit naming.
+__________________________
+
 == Community Integrations
 
 === Symfony
@@ -112,4 +121,4 @@ _____________________
 This helper is a light library which wrap the official client elasticsearch-php. It will help you to manage your ES Indices with no downtime.
 This helper implements the philosophy described in the https://www.elastic.co/guide/en/elasticsearch/guide/master/index-aliases.html[official documentation]
 which can be summarized in a few words : *use alias instead of index directly*
-_____________________
+_____________________

docs/configuration.asciidoc

@@ -60,16 +60,17 @@ Basic Auth's password contains special characters such as a pound sign (`#`) or
 For this reason, the client supports an extended host syntax which provides greater control over host initialization.
 None of the components are validated, so edge-cases like underscores domain names will not cause problems.
 
-The extended syntax is an array of parameters for each host:
+The extended syntax is an array of parameters for each host. The structure of the parameter list is identical to the return values of a http://php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-returnvalues[`parse_url()`] call:
 
 [source,php]
 ----
 $hosts = [
-    // This is effectively equal to: "https://username:password!#$?*[email protected]:9200/"
+    // This is effectively equal to: "https://username:password!#$?*[email protected]:9200/elastic"
     [
         'host' => 'foo.com',
         'port' => '9200',
         'scheme' => 'https',
+        'path' => '/elastic',
         'user' => 'username',
         'pass' => 'password!#$?*abc'
     ],

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"
     }
 }
 --------------------------

docs/php-version-requirement.asciidoc

@@ -1,5 +1,5 @@
 [[php_version_requirement]]
 == PHP Version Requirement
 
-Version 5.0 of Elasticsearch-PHP requires PHP version 5.6.6 or higher. In addition, it requires the native JSON
+Version 6.0 of Elasticsearch-PHP requires PHP version 7.0.0 or higher. In addition, it requires the native JSON
 extension to be version 1.3.7 or higher.

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">