Skip to content

Commit

Permalink
Merge pull request #50 from SamuelNitsche/master
Browse files Browse the repository at this point in the history
Laravel 7 compatibility
  • Loading branch information
clarkeash authored Mar 8, 2020
2 parents a7b2e56 + 20a9e23 commit 6fcf6f5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cache:

before_install:
- travis_retry composer self-update
- composer require "laravel/framework:^6.0" --no-update
- composer require "orchestra/testbench:^4.0" --no-update
- composer require "laravel/framework:^7.0" --no-update
- composer require "orchestra/testbench:^5.0" --no-update

install:
- travis_retry composer update --prefer-source --no-interaction --no-suggest
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ Invite Codes:
:---------|:----------
5.x | 3.x
6.x | 4.x
7.x | 5.x

## Installation

You can pull in the package using [composer](https://getcomposer.org):

```bash
$ composer require "clarkeash/doorman=^4.0"
$ composer require "clarkeash/doorman=^5.0"
```

Next, migrate the database:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
}
],
"require": {
"php": "^7.2",
"laravel/framework": "^6.0",
"php": "^7.2.5",
"laravel/framework": "^7.0",
"ramsey/uuid": "^3.6"
},
"autoload": {
Expand All @@ -24,7 +24,7 @@
}
},
"require-dev": {
"orchestra/testbench": "^4.0",
"orchestra/testbench": "^5.0",
"phpunit/phpunit": "^8.0",
"mockery/mockery": "^1.2"
},
Expand Down

0 comments on commit 6fcf6f5

Please sign in to comment.