Skip to content

Commit

Permalink
Laravel 5.8 Support (#22)
Browse files Browse the repository at this point in the history
* Update composer.json

* fix test

* fix test
  • Loading branch information
kawax authored and codyphobe committed Feb 28, 2019
1 parent 0789ff2 commit 397a25b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

env:
matrix:
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@
],
"require": {
"php": ">=7.1.2",
"ext-json": "*",
"guzzlehttp/guzzle": "~6.0",
"illuminate/notifications": "5.6.*|5.7.*",
"illuminate/support": "5.6.*|5.7.*",
"illuminate/queue": "5.6.*|5.7.*",
"illuminate/console": "5.6.*|5.7.*",
"illuminate/notifications": "^5.6",
"illuminate/support": "^5.6",
"illuminate/queue": "^5.6",
"illuminate/console": "^5.6",
"textalk/websocket": "1.0.*"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "3.6.*|3.7.*",
"laravel/framework": "5.6.*|5.7.*",
"orchestra/testbench": "^3.6",
"laravel/framework": "^5.6",
"phpunit/phpunit": "7.*",
"orchestra/database": "3.6.x-dev"
"orchestra/database": "3.8.x-dev"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/BaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

abstract class BaseTest extends \PHPUnit\Framework\TestCase
{
public function tearDown()
public function tearDown(): void
{
parent::tearDown();

Expand Down
15 changes: 6 additions & 9 deletions tests/SetupCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ public function it_requires_a_bot_token()

$this->app[Kernel::class]->registerCommand($command);

$returnCode = $this->artisan('discord:setup');

$this->assertEquals($returnCode, -1);
$this->artisan('discord:setup')
->assertExitCode(-1);
}

/** @test */
Expand All @@ -41,9 +40,8 @@ public function it_tells_the_user_to_connect_the_bot_to_their_discord_server()

$this->app[Kernel::class]->registerCommand($command);

$returnCode = $this->artisan('discord:setup');

$this->assertEquals($returnCode, -1);
$this->artisan('discord:setup')
->assertExitCode(-1);
}

/** @test */
Expand Down Expand Up @@ -164,8 +162,7 @@ public function it_notifies_the_user_of_a_failed_identification_attempt()

$this->app[Kernel::class]->registerCommand($command);

$returnCode = $this->artisan('discord:setup');

$this->assertEquals($returnCode, -1);
$this->artisan('discord:setup')
->assertExitCode(-1);
}
}

0 comments on commit 397a25b

Please sign in to comment.