diff --git a/.travis.yml b/.travis.yml index 3cf389d..6667310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: php php: - - 7.1 - 7.2 + - 7.3 + - 7.4 before_script: composer install diff --git a/composer.json b/composer.json index 9075fe7..5dbb6b4 100644 --- a/composer.json +++ b/composer.json @@ -11,18 +11,18 @@ ], "minimum-stability": "stable", "require": { - "php": ">=7.1", + "php": ">=7.2", "guzzlehttp/guzzle": "^6.2", - "illuminate/http": "^5.4", - "illuminate/support": "^5.4", - "nesbot/carbon": "^1.22 || ^2.0", + "illuminate/http": "^6.0", + "illuminate/support": "^6.0", + "nesbot/carbon": "^2.0", "ramsey/uuid": "^3.6" }, "require-dev": { - "jshayes/fake-requests": "^2.0", - "mockery/mockery": "^0.9.9", - "orchestra/testbench": "^3.4", - "phpunit/phpunit": "^6.0", + "jshayes/fake-requests": "^3.0", + "mockery/mockery": "^1.0", + "orchestra/testbench": "^4.0", + "phpunit/phpunit": "^8.0", "satooshi/php-coveralls": "^1.0" }, "autoload": { diff --git a/tests/ClientTest.php b/tests/ClientTest.php index 71c4741..294750d 100644 --- a/tests/ClientTest.php +++ b/tests/ClientTest.php @@ -57,7 +57,7 @@ public function fromInteger($integer) }); } - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php index e02f893..2df423f 100644 --- a/tests/ServiceProviderTest.php +++ b/tests/ServiceProviderTest.php @@ -2,6 +2,7 @@ namespace Tests; +use Illuminate\Support\Str; use Orchestra\Testbench\TestCase as Base; use SoapBox\SignedRequests\ServiceProvider; @@ -20,8 +21,8 @@ public function it_publishes_configurations_when_it_is_booted() $this->assertNotEmpty($publishes); foreach ($publishes as $key => $value) { - $this->assertTrue(ends_with($key, 'signed-requests.php')); - $this->assertTrue(ends_with($value, 'signed-requests.php')); + $this->assertTrue(Str::endsWith($key, 'signed-requests.php')); + $this->assertTrue(Str::endsWith($value, 'signed-requests.php')); } } } diff --git a/tests/TestCase.php b/tests/TestCase.php index ebd0ab0..a461d92 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,15 +7,6 @@ abstract class TestCase extends Base { - /** - * @before - */ - protected function setUpMockery() - { - Mockery::getConfiguration()->allowMockingNonExistentMethods(false); - Mockery::getConfiguration()->allowMockingMethodsUnnecessarily(false); - } - /** * @after */