Skip to content

Commit 9ef60c8

Browse files
committed
Merged with master + added 7.0.0 tests
2 parents 65b264a + b875f6e commit 9ef60c8

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.gitattributes

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Files to exclude when creating archive
2+
/tests export-ignore
3+
/.github export-ignore
4+
/.gitmodules export-ignore
5+
/.gitignore export-ignore
6+
/.php_cs export-ignore
7+
/.travis.yml export-ignore
8+
/.phpstan-src.neon export-ignore
9+
/.phpstan-src-71.neon export-ignore
10+
/.phpstan-tests.neon export-ignore
11+
/phpunit-integration.xml export-ignore
12+
/phpunit.xml export-ignore
13+
/ruleset.xml export-ignore
14+
/travis export-ignore
15+
/util export-ignore

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ sudo: true
1212
matrix:
1313
fast_finish: true
1414
include:
15+
- php: 7.1
16+
env: ES_VERSION="7.0.0"
17+
- php: 7.2
18+
env: ES_VERSION="7.0.0"
19+
- php: 7.3
20+
env: ES_VERSION="7.0.0"
1521
- php: 7.1
1622
env: ES_VERSION="7.1.0"
1723
- php: 7.2

src/Elasticsearch/Client.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,6 @@ public function scroll(array $params = [])
10261026
{
10271027
$scrollID = $this->extractArgument($params, 'scroll_id');
10281028
$body = $this->extractArgument($params, 'body');
1029-
$scroll = $this->extractArgument($params, 'scroll');
10301029

10311030
/**
10321031
* @var callable $endpointBuilder

src/Elasticsearch/Common/Exceptions/NoNodesAvailableException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
1414
* @link http://elastic.co
1515
*/
16-
class NoNodesAvailableException extends \Exception implements ElasticsearchException
16+
class NoNodesAvailableException extends ServerErrorResponseException implements ElasticsearchException
1717
{
1818
}

0 commit comments

Comments
 (0)