Skip to content

Commit

Permalink
Merge pull request #9 from softonic/Laravel-8-support
Browse files Browse the repository at this point in the history
Laravel 8 support
  • Loading branch information
xaviapa authored Nov 2, 2020
2 parents 09de665 + 27cc1b8 commit 8ec56c7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 27 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ env:

matrix:
include:
- php: 7.1
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
- php: 7.2
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
- php: 7.3
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
- php: 7.4
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ To run the tests, run the following command from the project folder.
$ docker-compose run test
```

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

License
-------

Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"issues": "https://github.com/softonic//issues"
},
"require": {
"php": ">=7.1",
"illuminate/http": "^5.6 || ^6.0 || ^7.0",
"php": ">=7.3",
"illuminate/http": "^7.0 || ^8.0",
"nyholm/psr7": "^1.2",
"psr/http-server-middleware": "^1.0",
"symfony/psr-http-message-bridge": "^2.0",
"nyholm/psr7": "^1.2"
"symfony/psr-http-message-bridge": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"friendsofphp/php-cs-fixer": "^2.4"
"friendsofphp/php-cs-fixer": "^2.16",
"phpunit/phpunit": "^9.0"
},
"autoload": {
"psr-4": {
Expand All @@ -30,7 +30,7 @@
}
},
"scripts": {
"test": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
"tests": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
"phpunit": "phpunit --coverage-text",
"phpcs": "php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
"fix-cs": "php-cs-fixer fix -v --diff --allow-risky=yes;"
Expand Down
34 changes: 23 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
version: '3.2'
version: "3.7"

services:
php:
volumes:
- ./:/app
image: composer:2.0

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

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

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

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

psysh:
volumes:
- ./:/app
image: ricc/psysh:latest

0 comments on commit 8ec56c7

Please sign in to comment.