Skip to content

Commit 1ddaa35

Browse files
authored
Merge pull request #57 from specialtactics/feature/laravel-6-compatability
Laravel 6 compatibility
2 parents 5565a99 + 7365a6e commit 1ddaa35

6 files changed

+12
-10
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Homestead.yaml
77
.DS_Store
88
composer.lock
99
phpunit.xml
10+
.phpunit.result.cache

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: php
22
php:
3-
- 7.0
43
- 7.1
4+
- 7.2
5+
- 7.3
56
before_script: composer install

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
"require": {
2727
"php": ">=7.0",
2828
"php-amqplib/php-amqplib": "v2.8.1",
29-
"illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.*",
30-
"illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*",
31-
"vinelab/http": "^1.5",
32-
"illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*"
29+
"illuminate/console": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6",
30+
"illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6",
31+
"illuminate/filesystem": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.* || ^6",
32+
"vinelab/http": "^1.5"
3333
},
3434

3535
"require-dev": {
3636
"mockery/mockery": "^1.0",
37-
"orchestra/testbench": "3.4.*",
38-
"phpunit/phpunit": "~5.7"
37+
"orchestra/testbench": "3.4.* || ^4",
38+
"phpunit/phpunit": "~5.7 || ~8.3"
3939
},
4040

4141
"autoload": {

tests/ConnectionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
class ConnectionTest extends TestCase
1616
{
17-
public function tearDown()
17+
public function tearDown() : void
1818
{
1919
M::close();
2020
}

tests/Console/Commands/ConsumerHealthCheckCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
class ConsumerHealthCheckCommandTest extends TestCase
1616
{
17-
public function tearDown()
17+
public function tearDown() : void
1818
{
1919
M::close();
2020
}

tests/MessageLifecycleManagerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MessageLifecycleManagerTest extends TestCase
2424
*/
2525
private $config;
2626

27-
protected function setUp()
27+
protected function setUp() : void
2828
{
2929
parent::setUp();
3030
$this->logger = Mockery::spy(Log::class);

0 commit comments

Comments
 (0)