Skip to content
This repository has been archived by the owner on May 28, 2023. It is now read-only.

Commit

Permalink
Compatibility with Laravel 5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
joselfonseca committed Apr 26, 2019
1 parent 4e2577d commit 4a43522
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ composer.phar
composer.lock
/nbproject
/site
/build
/build
.idea/
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"require": {
"php": ">=7.1",
"spatie/laravel-fractal": "5.4.*",
"dingo/api": "2.0.0-alpha2"
"dingo/api": "^2.2"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"mockery/mockery": "0.9.*",
"orchestra/testbench": "^3.7",
"phpunit/phpunit": "^7.5",
"mockery/mockery": "^1.0",
"orchestra/testbench": "^3.8",
"orchestra/database": "^3.5"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected function getPackageProviders($app)
protected function getPackageAliases($app)
{
return [
'Uuid' => \Webpatser\Uuid\Uuid::class,

];
}

Expand Down
4 changes: 2 additions & 2 deletions tests/Traits/FilterableTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class FilterableTraitTest extends TestCase
{
protected $_faker;

public function setUp()
public function setUp() : void
{
parent::setUp();
$this->_faker = Faker::create();
Expand Down Expand Up @@ -359,7 +359,7 @@ public function testAppliesOtherCustomOperatorToQuery()
$model = Mockery::mock('ModelFake');

$model->shouldReceive('where')
->with('name', '<>', $requestFields['name'])
->with('name', '<=', $requestFields['name'])
->once()
->andReturn(Mockery::self());

Expand Down
4 changes: 2 additions & 2 deletions tests/Traits/OrderableTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ class OrderQueryResultHelperTest extends TestCase
{
protected $_faker;

protected function setUp()
public function setUp() : void
{
parent::setUp();
$this->_faker = Faker::create();
}

protected function tearDown()
protected function tearDown() : void
{
parent::tearDown();
Mockery::close();
Expand Down
2 changes: 1 addition & 1 deletion tests/Traits/ProcessMultipleParameterHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ProcessMultipleParameterHelperTest extends TestCase
{
protected $_faker;

protected function setUp()
public function setUp() : void
{
parent::setUp();
$this->_faker = Faker::create();
Expand Down
2 changes: 1 addition & 1 deletion tests/Traits/UuidScopeTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class UuidScopeTraitTest extends TestCase
/**
* Run migrations for the tests
*/
public function setUp()
public function setUp() : void
{
parent::setUp();
$this->artisan('migrate', ['--database' => 'testbench']);
Expand Down

0 comments on commit 4a43522

Please sign in to comment.