Merge pull request #11 from dimatock/laravel6

Update dep to laravel 6

Author: xxxcoltxxx

composer.json

@@ -19,10 +19,10 @@
         "files": ["./tests/helpers.php"]
     },
     "require": {
-        "illuminate/support": "^5.6",
-        "illuminate/database": "^5.6",
-        "illuminate/config": "^5.6",
-        "illuminate/http": "^5.6",
+        "illuminate/support": "^6.0",
+        "illuminate/database": "^6.0",
+        "illuminate/config": "^6.0",
+        "illuminate/http": "^6.0",
         "ext-json": "*"
     },
     "extra": {
@@ -31,7 +31,7 @@
         }
     },
     "require-dev": {
-        "orchestra/testbench": "~3.6.6",
+        "orchestra/testbench": "^4.0",
         "mockery/mockery": "^1.2",
         "phpro/grumphp": "^0.15.0",
         "phpmd/phpmd": "^2.6",

tests/ConditionalActionsTestCase.php

@@ -14,7 +14,7 @@ class ConditionalActionsTestCase extends OrchestraTestCase
 {
     use DummyTestHelper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/EloquentConditionalActionsTestCase.php

@@ -4,7 +4,7 @@
 
 class EloquentConditionalActionsTestCase extends ConditionalActionsTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->withFactories(realpath(\dirname(__DIR__) . '/tests/database/factories'));

tests/Feature/Entities/Eloquent/ConditionActionTest.php

@@ -15,7 +15,7 @@ class ConditionActionTest extends EloquentConditionalActionsTestCase
     /** @var Carbon */
     private $now = '2019-01-05 10:00:00';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Carbon::setTestNow(Carbon::parse($this->now));

tests/Feature/Entities/Eloquent/ConditionTest.php

@@ -16,7 +16,7 @@ class ConditionTest extends EloquentConditionalActionsTestCase
     /** @var Carbon */
     private $now = '2019-01-05 10:00:00';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Carbon::setTestNow(Carbon::parse($this->now));

tests/Feature/Http/Conditions/ActionsControllerTest.php

@@ -20,7 +20,7 @@ class ActionsControllerTest extends ConditionalActionsTestCase
 
     private $validParams = ['name' => 'UpdateStateAttributeAction', 'condition_id' => 10];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Feature/Http/Conditions/ConditionsControllerTest.php

@@ -18,7 +18,7 @@ class ConditionsControllerTest extends ConditionalActionsTestCase
     /** @var Mockery\MockInterface */
     private $conditionRepositoryMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Feature/Repositories/EloquentActionRepositoryTest.php

@@ -23,7 +23,7 @@ class EloquentActionRepositoryTest extends EloquentConditionalActionsTestCase
         'ends_at' => '2019-01-02 20:00:00',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Feature/Repositories/EloquentConditionRepositoryTest.php

@@ -21,7 +21,7 @@ class EloquentConditionRepositoryTest extends EloquentConditionalActionsTestCase
         'ends_at' => '2019-01-02 20:00:00',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->conditionsRepository = \app(EloquentConditionRepository::class);

tests/Unit/ConditionActionManagerTest.php

@@ -15,7 +15,7 @@ class ConditionActionManagerTest extends ConditionalActionsTestCase
     /** @var DummyTarget */
     private $target;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->manager = \app(ConditionalActionManager::class);