Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ sudo: false

matrix:
include:
- php: 7.2
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
- php: 7.3
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
- php: master
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,7 @@ Testing
To run the tests, run the following command from the project folder.

``` bash
$ docker-compose run tests
```

To run interactively using [PsySH](http://psysh.org/):
``` bash
$ docker-compose run psysh
$ docker-compose run test
```

License
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
},
"require": {
"php": ">=7.2",
"illuminate/http": "^5.8 || ^6.0 || ^7.0",
"illuminate/contracts": "^5.8 || ^6.0 || ^7.0"
"illuminate/http": "^7.0 || ^8.0",
"illuminate/contracts": "^7.0 || ^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^8.0",
"friendsofphp/php-cs-fixer": "^2.4"
"phpunit/phpunit": "^9.0"
},
"autoload": {
"psr-4": {
Expand Down
30 changes: 21 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
version: '3.6'
version: "3.7"

services:
tests:
php:
volumes:
- ./:/app
image: ricc/composer-prestissimo:latest
command: composer run tests
image: composer:2.0

fixcs:
install:
volumes:
- ./:/app
image: ricc/composer-prestissimo:latest
command: composer run fix-cs
image: composer:2.0
command: composer install

phpunit:
volumes:
- ./:/app
image: composer:2.0
command: composer phpunit

psysh:
test:
volumes:
- ./:/app
image: ricc/psysh:latest
image: composer:2.0
command: composer run tests

fixcs:
volumes:
- ./:/app
image: composer:2.0
command: composer run fix-cs