Skip to content

Commit

Permalink
Merge pull request #15
Browse files Browse the repository at this point in the history
Bump supported php versions
  • Loading branch information
tux-rampage committed Oct 6, 2020
2 parents d909fbc + 1e6529a commit cd20d42
Show file tree
Hide file tree
Showing 15 changed files with 409 additions and 74 deletions.
20 changes: 8 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,28 @@ env:
matrix:
fast_finish: true
include:
- php: 7.1
- php: 7.3
env:
- DEPS=lowest
- php: 7.1
- php: 7.3
env:
- DEPS=latest
- TEST_COVERAGE=true
- STATIC_ANALYSIS=true
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=latest
- php: 7.3
- php: 7.4
env:
- DEPS=lowest
- php: 7.3
- php: 7.4
env:
- DEPS=latest
- php: 7.4
- php: nightly
env:
- DEPS=lowest
- php: 7.4
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
- php: nightly
env:
- DEPS=latest
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
Expand Down
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,20 @@
}
},
"require": {
"php": "^7.1",
"laminas/laminas-stdlib": "^3.2.1",
"php": "^7.3 || ~8.0.0",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
"phpstan/phpstan-shim": "^0.10.5",
"psr/container": "^1.0",
"psr/log": "^1.0"
},
"require-dev": {
"container-interop/container-interop": "^1.2.0",
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-servicemanager": "^3.0",
"laminas/laminas-servicemanager": "^3.4",
"mikey179/vfsstream": "^1.6.7",
"phpunit/phpunit": "^7.5.18 || ^8.5"
"phpstan/phpstan": "^0.12",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.3"
},
"conflict": {
"laminas/laminas-servicemanager-di": "*",
Expand Down Expand Up @@ -72,4 +73,4 @@
"replace": {
"zendframework/zend-di": "^3.1.2"
}
}
}

0 comments on commit cd20d42

Please sign in to comment.