Skip to content

Commit

Permalink
Merge pull request #263 from mehranabi/master
Browse files Browse the repository at this point in the history
Laravel 8.x Support
  • Loading branch information
musonza authored Sep 19, 2020
2 parents ee26a53 + baa9192 commit 1ed1f5e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ language: php

matrix:
include:
- php: 7.2
env: ILLUMINATE_VERSION=6.0
- php: 7.2
env: ILLUMINATE_VERSION=6.*
- php: 7.3
env: ILLUMINATE_VERSION=8.*
php:
- 7.2
- 7.3

sudo: false

Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"conversation"
],
"require": {
"php": "^7.2",
"laravel/framework": "^6.0|^7.0",
"spatie/laravel-fractal": "^5.7"
"php": ">=7.3",
"laravel/framework": "^6.0|^7.0|^8.0",
"spatie/laravel-fractal": "^5.8",
"laravel/legacy-factories": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"orchestra/testbench": "^4.0",
"orchestra/database": "^4.0",
"phpunit/phpunit": "^8.0|^9.0",
"orchestra/testbench": "^4.0|^6.0",
"mockery/mockery": "^1.0.0"
},
"license": "MIT",
Expand Down
2 changes: 0 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Musonza\Chat\ChatServiceProvider;
use Musonza\Chat\Facades\ChatFacade;
use Musonza\Chat\Tests\Helpers\Models\User;
use Orchestra\Database\ConsoleServiceProvider;

class TestCase extends \Orchestra\Testbench\TestCase
{
Expand Down Expand Up @@ -107,7 +106,6 @@ protected function getEnvironmentSetUp($app)
protected function getPackageProviders($app)
{
return [
ConsoleServiceProvider::class,
ChatServiceProvider::class,
];
}
Expand Down

0 comments on commit 1ed1f5e

Please sign in to comment.