Skip to content

Commit

Permalink
Finish laravel 5.8 compatability upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
rydurham committed Mar 2, 2019
1 parent c669f94 commit ae25c90
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Make sure you use the version most appropriate for the type of Laravel applicati

| Laravel Version | Centaur Version | Packagist Branch |
|---|---|---|
| 5.5.* | 5.* | ```"srlabs/centaur": "5.*"``` |
| 5.6.* | 6.* | ```"srlabs/centaur": "6.*"``` |
| 5.7.* | 7.* | ```"srlabs/centaur": "7.*"``` |
| 5.8.* | 8.* | ```"srlabs/centaur": "8.*"``` |

If you are using an older version of Laravel, there are [other versions](https://packagist.org/packages/srlabs/centaur) available.

Expand Down
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
"cartalyst/sentinel": "2.0.*"
},
"require-dev": {
"phpunit/phpunit": "7.1.*",
"orchestra/testbench": "3.8.x@dev",
"mockery/mockery": "^1.0",
"symfony/css-selector": "3.2.*",
"symfony/dom-crawler": "3.2.*"
"phpunit/phpunit": "7.5.*",
"orchestra/testbench": "3.8.*",
"mockery/mockery": "^1.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
20 changes: 1 addition & 19 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TestCase extends OrchestraTestCase
*
* @return void
*/
public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down Expand Up @@ -93,24 +93,6 @@ public function prepareTestingDatabase()
exec('cp ' . __DIR__ . '/data/staging.sqlite ' . __DIR__ . '/data/database.sqlite');
}

/**
* Overide the default application exception handler
*
* Thanks Adam!
* https://gist.github.com/adamwathan/125847c7e3f16b88fa33a9f8b42333da
*/
protected function disableExceptionHandling()
{
$this->oldExceptionHandler = $this->app->make(ExceptionHandler::class);
$this->app->instance(ExceptionHandler::class, new class extends Handler {
public function __construct() {}
public function report(\Exception $e) {}
public function render($request, \Exception $e) {
throw $e;
}
});
}

/**
* A helper method for creating an active user session
* @param string $email
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/AuthManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AuthManagerTest extends TestCase
/** @var Centaur\AuthManager */
protected $authManager;

public function setUp()
public function setUp(): void
{
parent::setUp();
$this->authManager = $this->app->make(AuthManager::class);
Expand Down
3 changes: 1 addition & 2 deletions tests/Unit/ReplyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ReplyTest extends TestCase
/** @var Centaur\AuthManager */
protected $authManager;

public function setUp()
public function setUp(): void
{
parent::setUp();
$this->authManager = $this->app->make(AuthManager::class);
Expand Down Expand Up @@ -115,6 +115,5 @@ public function it_can_be_cast_as_an_array()
];

$this->assertEquals($expectation, $reply->toArray());

}
}

0 comments on commit ae25c90

Please sign in to comment.