Skip to content

Commit 3bdffe2

Browse files
committed
Merge branch 'master' into v2
2 parents 7272f50 + f2de65c commit 3bdffe2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.php_cs.cache
2+
.phpunit.result.cache
23
build
34
composer.lock
45
files

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
],
1414
"require": {
1515
"php": "^7.1.3",
16-
"illuminate/config": ">=5.5 <6.0",
17-
"illuminate/support": ">=5.5 <6.0",
18-
"illuminate/database": ">=5.5 <6.0"
16+
"illuminate/config": "^5.5|^6.0",
17+
"illuminate/support": "^5.5|^6.0",
18+
"illuminate/database": "^5.5|^6.0"
1919
},
2020
"require-dev": {
2121
"adamwathan/faktory": "0.3.*",
2222
"friendsofphp/php-cs-fixer": "^2.5",
23-
"orchestra/testbench": "~3.0",
23+
"orchestra/testbench": "^3.0|^4.0",
2424
"phpunit/phpunit": "^7.0"
2525
},
2626
"autoload": {

0 commit comments

Comments
 (0)