Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/50-psr-15' into release-5.0.0
Browse files Browse the repository at this point in the history
Close #50
  • Loading branch information
weierophinney committed Dec 7, 2017
2 parents fb26c47 + f4cffa5 commit 6ae121e
Show file tree
Hide file tree
Showing 11 changed files with 283 additions and 304 deletions.
29 changes: 3 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,17 @@ env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"

matrix:
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- TEST_COVERAGE=true
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- CS_CHECK=true
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
Expand All @@ -52,16 +33,12 @@ matrix:
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: 7.2

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- travis_retry composer self-update

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- travis_retry composer install $COMPOSER_ARGS
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"sort-packages": true
},
"require": {
"php": "^5.6 || ^7.0",
"php": "^7.1",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"webimpress/http-middleware-compatibility": "^0.1.1",
"zendframework/zend-expressive-router": "^2.2"
"http-interop/http-server-middleware": "^1.0.1",
"zendframework/zend-expressive-router": "^3.0.0@dev"
},
"require-dev": {
"malukenho/docheader": "^0.1.5",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^5.7.22 || ^6.4.1",
"phpunit/phpunit": "^6.4.4",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-diactoros": "^1.3.10"
},
Expand Down

0 comments on commit 6ae121e

Please sign in to comment.