Skip to content

Commit 85ac7cc

Browse files
authored
Merge pull request #4 from softonic/Laravel-8-support
Laravel 8 support
2 parents 96a1b80 + 24a9a68 commit 85ac7cc

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ sudo: false
44

55
matrix:
66
include:
7-
- php: 7.2
8-
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
97
- php: 7.3
108
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
119
- php: master

README.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ Testing
4444
To run the tests, run the following command from the project folder.
4545

4646
``` bash
47-
$ docker-compose run tests
48-
```
49-
50-
To run interactively using [PsySH](http://psysh.org/):
51-
``` bash
52-
$ docker-compose run psysh
47+
$ docker-compose run test
5348
```
5449

5550
License

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
},
1111
"require": {
1212
"php": ">=7.2",
13-
"illuminate/http": "^5.8 || ^6.0 || ^7.0",
14-
"illuminate/contracts": "^5.8 || ^6.0 || ^7.0"
13+
"illuminate/http": "^7.0 || ^8.0",
14+
"illuminate/contracts": "^7.0 || ^8.0"
1515
},
1616
"require-dev": {
17+
"friendsofphp/php-cs-fixer": "^2.16",
1718
"mockery/mockery": "^1.2",
18-
"phpunit/phpunit": "^8.0",
19-
"friendsofphp/php-cs-fixer": "^2.4"
19+
"phpunit/phpunit": "^9.0"
2020
},
2121
"autoload": {
2222
"psr-4": {

docker-compose.yml

+21-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
1-
version: '3.6'
1+
version: "3.7"
22

33
services:
4-
tests:
4+
php:
55
volumes:
66
- ./:/app
7-
image: ricc/composer-prestissimo:latest
8-
command: composer run tests
7+
image: composer:2.0
98

10-
fixcs:
9+
install:
1110
volumes:
1211
- ./:/app
13-
image: ricc/composer-prestissimo:latest
14-
command: composer run fix-cs
12+
image: composer:2.0
13+
command: composer install
14+
15+
phpunit:
16+
volumes:
17+
- ./:/app
18+
image: composer:2.0
19+
command: composer phpunit
1520

16-
psysh:
21+
test:
1722
volumes:
1823
- ./:/app
19-
image: ricc/psysh:latest
24+
image: composer:2.0
25+
command: composer run tests
26+
27+
fixcs:
28+
volumes:
29+
- ./:/app
30+
image: composer:2.0
31+
command: composer run fix-cs

0 commit comments

Comments
 (0)