File tree Expand file tree Collapse file tree 3 files changed +8
-7
lines changed
Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 1313 strategy :
1414 fail-fast : false
1515 matrix :
16+ <<<<<<< HEAD
1617 php-versions : ['7.3', '7.4', '8.0']
18+ =======
19+ php-versions : ['8.0', '8.1']
20+ >>>>>>> 15d7e94 (apply php 8.1 support)
1721 steps :
1822 - name : Setup PHP Action
1923 uses : shivammathur/setup-php@v2
Original file line number Diff line number Diff line change 2424 }
2525 ],
2626 "require" : {
27- "php" : " ^7.3|~ 8.0" ,
27+ "php" : " ^7.3|^ 8.0" ,
2828 "webmozart/assert" : " ^1.9"
2929 },
3030 "conflict" : {
3131 "mezzio/mezzio" : " <3.0" ,
3232 "laminas/laminas-mvc" : " <3.0"
3333 },
3434 "require-dev" : {
35- "kahlan/kahlan" : " ^5.0 " ,
35+ "kahlan/kahlan" : " dev-moving-to-github-action " ,
3636 "laminas/laminas-coding-standard" : " ^2.0" ,
3737 "laminas/laminas-mvc" : " ^3.0" ,
3838 "mezzio/mezzio" : " ^3.0" ,
3939 "php-coveralls/php-coveralls" : " ^2.1" ,
40- "phpstan/phpstan" : " ^1.0 " ,
40+ "phpstan/phpstan" : " ^1.1 " ,
4141 "phpstan/phpstan-webmozart-assert" : " ^1.0" ,
42- "rector/rector" : " dev-main "
42+ "rector/rector" : " 0.12.7 "
4343 },
4444 "config" : {
4545 "bin-dir" : " bin" ,
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments