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

Commit

Permalink
Merge branch 'hotfix/test-versions'
Browse files Browse the repository at this point in the history
Close #54
  • Loading branch information
weierophinney committed Mar 17, 2016
2 parents ab252e4 + d5f28a1 commit 2ef915e
Show file tree
Hide file tree
Showing 6 changed files with 3,246 additions and 50 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ nbproject
tmp/

clover.xml
composer.lock
coveralls-upload.json
phpunit.xml
vendor
43 changes: 30 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,51 @@ cache:
directories:
- $HOME/.composer/cache

env:
global:
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"

matrix:
fast_finish: true
include:
- php: 5.5
env:
- DEPS=lowest
- php: 5.5
env:
- EXECUTE_CS_CHECK=true
- DEPS=locked
- php: 5.5
env:
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- DEPS=latest
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- EXECUTE_TEST_COVERALLS=true
- DEPS=locked
- php: 5.6
env:
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- DEPS=lastest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- DEPS=locked
- php: 7
env:
- DEPS=latest
- php: hhvm
env:
- DEPS=lowest
- php: hhvm
env:
- DEPS=locked
- php: hhvm
env:
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- DEPS=latest
allow_failures:
- php: hhvm

Expand All @@ -49,13 +67,12 @@ before_install:
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- composer self-update
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
- if [[ $ZEND_EVENTMANAGER_VERSION != '' ]]; then composer require --no-update "zendframework/zend-eventmanager:$ZEND_EVENTMANAGER_VERSION" ; fi
- if [[ $ZEND_EVENTMANAGER_VERSION == '' ]]; then composer require --no-update "zendframework/zend-eventmanager:^3.0" ; fi
- if [[ $ZEND_SERVICEMANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$ZEND_SERVICEMANAGER_VERSION" ; fi
- if [[ $ZEND_SERVICEMANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi

install:
- travis_retry composer install --no-interaction --ignore-platform-reqs
- 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
- travis_retry composer install $COMPOSER_ARGS
- composer show --installed

script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"zendframework/zend-uri": "^2.5",
"fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "~4.0"
"phpunit/phpunit": "^4.5"
},
"suggest": {
"zendframework/zend-authentication": "Zend\\Authentication component",
Expand Down
Loading

0 comments on commit 2ef915e

Please sign in to comment.