From 0ec449111a580383ce0218aedfb60a5b9f5611b6 Mon Sep 17 00:00:00 2001 From: specialtactics Date: Tue, 22 Oct 2019 19:20:34 +1100 Subject: [PATCH 1/3] Make things compatible with Laravel 6 Also bump min php version from 7.0 to 7.1 --- .gitignore | 1 + composer.json | 12 ++++++------ tests/ConnectionTest.php | 2 +- .../Commands/ConsumerHealthCheckCommandTest.php | 2 +- tests/MessageLifecycleManagerTest.php | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5831ca9..1c85221 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ Homestead.yaml .DS_Store composer.lock phpunit.xml +.phpunit.result.cache \ No newline at end of file diff --git a/composer.json b/composer.json index 9ecaccf..8a51b57 100644 --- a/composer.json +++ b/composer.json @@ -26,16 +26,16 @@ "require": { "php": ">=7.0", "php-amqplib/php-amqplib": "v2.8.1", - "illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.*", - "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*", - "vinelab/http": "^1.5", - "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*" + "illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", + "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", + "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", + "vinelab/http": "^1.5" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "3.4.*", - "phpunit/phpunit": "~5.7" + "orchestra/testbench": "3.4.* || ^4", + "phpunit/phpunit": "~5.7 || ~8.3" }, "autoload": { diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php index c3a3f6b..2522210 100644 --- a/tests/ConnectionTest.php +++ b/tests/ConnectionTest.php @@ -14,7 +14,7 @@ */ class ConnectionTest extends TestCase { - public function tearDown() + public function tearDown() : void { M::close(); } diff --git a/tests/Console/Commands/ConsumerHealthCheckCommandTest.php b/tests/Console/Commands/ConsumerHealthCheckCommandTest.php index 1d097c6..7c7ac50 100644 --- a/tests/Console/Commands/ConsumerHealthCheckCommandTest.php +++ b/tests/Console/Commands/ConsumerHealthCheckCommandTest.php @@ -14,7 +14,7 @@ */ class ConsumerHealthCheckCommandTest extends TestCase { - public function tearDown() + public function tearDown() : void { M::close(); } diff --git a/tests/MessageLifecycleManagerTest.php b/tests/MessageLifecycleManagerTest.php index d099032..724c301 100644 --- a/tests/MessageLifecycleManagerTest.php +++ b/tests/MessageLifecycleManagerTest.php @@ -24,7 +24,7 @@ class MessageLifecycleManagerTest extends TestCase */ private $config; - protected function setUp() + protected function setUp() : void { parent::setUp(); $this->logger = Mockery::spy(Log::class); From d8b3c8c120ee988743c2ce065a6626c14595af52 Mon Sep 17 00:00:00 2001 From: specialtactics Date: Tue, 22 Oct 2019 19:24:39 +1100 Subject: [PATCH 2/3] Update php version in travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe3309e..a79eeb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: php php: - - 7.0 - 7.1 + - 7.2 + - 7.3 before_script: composer install From 7365a6e9f551719e3597df08b337bc8be950fd26 Mon Sep 17 00:00:00 2001 From: specialtactics Date: Tue, 22 Oct 2019 19:25:41 +1100 Subject: [PATCH 3/3] Also may as well include laravel 5.8 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 8a51b57..3d0b3e0 100644 --- a/composer.json +++ b/composer.json @@ -26,9 +26,9 @@ "require": { "php": ">=7.0", "php-amqplib/php-amqplib": "v2.8.1", - "illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", - "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", - "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.* || ^6", + "illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6", + "illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6", + "illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6", "vinelab/http": "^1.5" },