From a3416b7566116512218e0ccb586b96543bcd75a7 Mon Sep 17 00:00:00 2001 From: arubacao Date: Mon, 2 Oct 2017 14:06:11 +0200 Subject: [PATCH 1/7] upgrade to phpunit/phpunit:"~6.0" --- composer.json | 2 +- tests/IronJobTest.php | 3 ++- tests/IronQueueTest.php | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7825329..c8bd9c4 100755 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ }, "require-dev": { "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~6.0" }, "autoload": { "psr-4": { diff --git a/tests/IronJobTest.php b/tests/IronJobTest.php index 8dd0d85..cbb1dce 100644 --- a/tests/IronJobTest.php +++ b/tests/IronJobTest.php @@ -1,8 +1,9 @@ Date: Mon, 2 Oct 2017 14:07:04 +0200 Subject: [PATCH 2/7] require php:">=7.0.0" (Laravel 5.5 minimum requirement) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c8bd9c4..43836dc 100755 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": ">=5.6.4", + "php": ">=7.0.0", "illuminate/container": "5.4.*", "illuminate/contracts": "5.4.*", "illuminate/encryption": "5.4.*", From 20361c68d993e658765331dbd0ea88b6fa5dfb67 Mon Sep 17 00:00:00 2001 From: arubacao Date: Mon, 2 Oct 2017 14:07:25 +0200 Subject: [PATCH 3/7] to not test against php 5.6 anymore --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 392159a..ca6f715 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.6 - 7.0 - 7.1 From 534b98c18015237614bb2c66b96802ca5271ffab Mon Sep 17 00:00:00 2001 From: arubacao Date: Mon, 2 Oct 2017 14:09:06 +0200 Subject: [PATCH 4/7] add laravel 5.5 autodiscover --- composer.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/composer.json b/composer.json index 43836dc..5dfe924 100755 --- a/composer.json +++ b/composer.json @@ -32,5 +32,12 @@ "psr-4": { "Collective\\IronQueue\\": "src/" } + }, + "extra": { + "laravel": { + "providers": [ + "Collective\\IronQueue\\IronQueueServiceProvider" + ] + } } } From e4ce24296356a228506d682223e8331714541c31 Mon Sep 17 00:00:00 2001 From: arubacao Date: Mon, 2 Oct 2017 14:12:01 +0200 Subject: [PATCH 5/7] remove duplicate PHPDoc argument --- src/Connectors/IronConnector.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Connectors/IronConnector.php b/src/Connectors/IronConnector.php index 9dc0fd8..eff6930 100755 --- a/src/Connectors/IronConnector.php +++ b/src/Connectors/IronConnector.php @@ -42,7 +42,6 @@ public function __construct(EncrypterContract $crypt, Request $request) * Establish a queue connection. * * @param array $config - * @param array $config * * @return IronQueue */ From 3c46755528ff61957fb7d1081549d09ef7c3f07e Mon Sep 17 00:00:00 2001 From: arubacao Date: Mon, 2 Oct 2017 14:17:11 +0200 Subject: [PATCH 6/7] require illuminate 5.5 components --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 5dfe924..ea83005 100755 --- a/composer.json +++ b/composer.json @@ -15,12 +15,12 @@ ], "require": { "php": ">=7.0.0", - "illuminate/container": "5.4.*", - "illuminate/contracts": "5.4.*", - "illuminate/encryption": "5.4.*", - "illuminate/http": "5.4.*", - "illuminate/queue": "5.4.*", - "illuminate/support": "5.4.*", + "illuminate/container": "5.5.*", + "illuminate/contracts": "5.5.*", + "illuminate/encryption": "5.5.*", + "illuminate/http": "5.5.*", + "illuminate/queue": "5.5.*", + "illuminate/support": "5.5.*", "iron-io/iron_mq": "~4.0", "jeremeamia/superclosure": "~2.0" }, From d90fed2adddcc9881c69c331846c9c218a19659d Mon Sep 17 00:00:00 2001 From: trideout Date: Mon, 9 Oct 2017 17:19:53 -0600 Subject: [PATCH 7/7] Update IronQueueTest.php --- tests/IronQueueTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/IronQueueTest.php b/tests/IronQueueTest.php index 7e831dd..420a1a6 100644 --- a/tests/IronQueueTest.php +++ b/tests/IronQueueTest.php @@ -3,7 +3,6 @@ use Mockery as m; use PHPUnit\Framework\TestCase; use SuperClosure\Serializer; -use PHPUnit\Framework\TestCase; class IronQueueTest extends TestCase {