Skip to content

Commit

Permalink
Merge pull request #57 from specialtactics/feature/laravel-6-compatab…
Browse files Browse the repository at this point in the history
…ility

Laravel 6 compatibility
  • Loading branch information
KinaneD authored Oct 22, 2019
2 parents 5565a99 + 7365a6e commit 1ddaa35
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Homestead.yaml
.DS_Store
composer.lock
phpunit.xml
.phpunit.result.cache
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: php
php:
- 7.0
- 7.1
- 7.2
- 7.3
before_script: composer install
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.*|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"
},

"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": {
Expand Down
2 changes: 1 addition & 1 deletion tests/ConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class ConnectionTest extends TestCase
{
public function tearDown()
public function tearDown() : void
{
M::close();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Console/Commands/ConsumerHealthCheckCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class ConsumerHealthCheckCommandTest extends TestCase
{
public function tearDown()
public function tearDown() : void
{
M::close();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/MessageLifecycleManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1ddaa35

Please sign in to comment.