Skip to content

Commit 4d9ffa1

Browse files
committed
Updated composer and added void in setUp and tearDown for PHPUnit
1 parent 0e80001 commit 4d9ffa1

15 files changed

+24
-22
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ generator/*
2424
util/elasticsearch
2525
util/cache/
2626
util/output
27+
util/backup_*
2728

2829
# Sami docs generator
2930
/sami.phar
3031

3132
# PHPUnit
3233
/phpunit.xml
34+
.phpunit.result.cache

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
}
1414
],
1515
"require": {
16-
"php": "^7.0",
16+
"php": "^7.1 || ^8.0",
1717
"ext-json": ">=1.3.7",
18-
"guzzlehttp/ringphp": "~1.0",
18+
"ezimuel/ringphp": "^1.1.2",
1919
"psr/log": "~1.0"
2020
},
2121
"require-dev": {
22-
"cpliakas/git-wrapper": "^1.7 || ^2.1",
23-
"doctrine/inflector": "^1.1",
22+
"cpliakas/git-wrapper": "~2.0 || ~3.0",
23+
"doctrine/inflector": "^1.3",
2424
"mockery/mockery": "^1.2",
25-
"phpstan/phpstan-shim": "^0.9 || ^0.11",
26-
"phpunit/phpunit": "^5.7 || ^6.5",
25+
"phpstan/phpstan": "^0.12",
26+
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
2727
"squizlabs/php_codesniffer": "^3.4",
28-
"symfony/finder": "^2.8",
29-
"symfony/yaml": "^2.8"
28+
"symfony/finder": "~4.0",
29+
"symfony/yaml": "~4.0"
3030
},
3131
"suggest": {
3232
"ext-curl": "*",

tests/Elasticsearch/Tests/ClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class ClientTest extends \PHPUnit\Framework\TestCase
2424
{
25-
public function tearDown()
25+
public function tearDown(): void
2626
{
2727
m::close();
2828
}

tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class SniffingConnectionPoolIntegrationTest extends \PHPUnit\Framework\TestCase
2121
{
22-
protected function setUp()
22+
protected function setUp(): void
2323
{
2424
static::markTestSkipped("All of Sniffing unit tests use outdated cluster state format, need to redo");
2525
}

tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class SniffingConnectionPoolTest extends \PHPUnit\Framework\TestCase
2525
{
26-
protected function setUp()
26+
protected function setUp(): void
2727
{
2828
static::markTestSkipped("All of Sniffing unit tests use outdated cluster state format, need to redo");
2929
}

tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
class StaticConnectionPoolIntegrationTest extends \PHPUnit\Framework\TestCase
2020
{
21-
public function setUp()
21+
public function setUp(): void
2222
{
2323
if (empty(getenv('ES_TEST_HOST'))) {
2424
$this->markTestSkipped(

tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class StaticConnectionPoolTest extends \PHPUnit\Framework\TestCase
2525
{
26-
public function tearDown()
26+
public function tearDown(): void
2727
{
2828
m::close();
2929
}

tests/Elasticsearch/Tests/Connections/ConnectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ConnectionTest extends \PHPUnit\Framework\TestCase
1313
private $trace;
1414
private $serializer;
1515

16-
protected function setUp()
16+
protected function setUp(): void
1717
{
1818
$this->logger = $this->createMock(LoggerInterface::class);
1919
$this->trace = $this->createMock(LoggerInterface::class);

tests/Elasticsearch/Tests/Endpoints/AbstractEndpointTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testInvalidParamsCauseErrorsWhenProvidedToSetParams(array $param
3232
$this->endpoint->setParams($params);
3333
}
3434

35-
protected function setUp()
35+
protected function setUp(): void
3636
{
3737
$this->endpoint = $this->getMockForAbstractClass(AbstractEndpoint::class);
3838
}

tests/Elasticsearch/Tests/Endpoints/StatusEndpointTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class StatusEndpointTest extends \PHPUnit\Framework\TestCase
1111
{
1212
private $endpoint;
1313

14-
protected function setUp()
14+
protected function setUp(): void
1515
{
1616
$this->endpoint = new Status();
1717
}

0 commit comments

Comments
 (0)