Skip to content

Commit

Permalink
Merged with master + added 7.0.0 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ezimuel committed Jul 9, 2019
2 parents 65b264a + b875f6e commit 9ef60c8
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
15 changes: 15 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Files to exclude when creating archive
/tests export-ignore
/.github export-ignore
/.gitmodules export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
/.travis.yml export-ignore
/.phpstan-src.neon export-ignore
/.phpstan-src-71.neon export-ignore
/.phpstan-tests.neon export-ignore
/phpunit-integration.xml export-ignore
/phpunit.xml export-ignore
/ruleset.xml export-ignore
/travis export-ignore
/util export-ignore
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ sudo: true
matrix:
fast_finish: true
include:
- php: 7.1
env: ES_VERSION="7.0.0"
- php: 7.2
env: ES_VERSION="7.0.0"
- php: 7.3
env: ES_VERSION="7.0.0"
- php: 7.1
env: ES_VERSION="7.1.0"
- php: 7.2
Expand Down
1 change: 0 additions & 1 deletion src/Elasticsearch/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,6 @@ public function scroll(array $params = [])
{
$scrollID = $this->extractArgument($params, 'scroll_id');
$body = $this->extractArgument($params, 'body');
$scroll = $this->extractArgument($params, 'scroll');

/**
* @var callable $endpointBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
* @link http://elastic.co
*/
class NoNodesAvailableException extends \Exception implements ElasticsearchException
class NoNodesAvailableException extends ServerErrorResponseException implements ElasticsearchException
{
}

0 comments on commit 9ef60c8

Please sign in to comment.