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

Commit 2ef915e

Browse files
committed
Merge branch 'hotfix/test-versions'
Close #54
2 parents ab252e4 + d5f28a1 commit 2ef915e

File tree

6 files changed

+3246
-50
lines changed

6 files changed

+3246
-50
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ nbproject
99
tmp/
1010

1111
clover.xml
12-
composer.lock
1312
coveralls-upload.json
1413
phpunit.xml
1514
vendor

.travis.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,51 @@ cache:
1111
directories:
1212
- $HOME/.composer/cache
1313

14+
env:
15+
global:
16+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
17+
1418
matrix:
1519
fast_finish: true
1620
include:
21+
- php: 5.5
22+
env:
23+
- DEPS=lowest
1724
- php: 5.5
1825
env:
1926
- EXECUTE_CS_CHECK=true
27+
- DEPS=locked
2028
- php: 5.5
2129
env:
22-
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
23-
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
30+
- DEPS=latest
31+
- php: 5.6
32+
env:
33+
- DEPS=lowest
2434
- php: 5.6
2535
env:
2636
- EXECUTE_TEST_COVERALLS=true
37+
- DEPS=locked
2738
- php: 5.6
2839
env:
29-
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
30-
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
40+
- DEPS=lastest
3141
- php: 7
42+
env:
43+
- DEPS=lowest
3244
- php: 7
3345
env:
34-
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
35-
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
46+
- DEPS=locked
47+
- php: 7
48+
env:
49+
- DEPS=latest
3650
- php: hhvm
51+
env:
52+
- DEPS=lowest
53+
- php: hhvm
54+
env:
55+
- DEPS=locked
3756
- php: hhvm
3857
env:
39-
- ZEND_EVENTMANAGER_VERSION="^2.6.2"
40-
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
58+
- DEPS=latest
4159
allow_failures:
4260
- php: hhvm
4361

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

5771
install:
58-
- travis_retry composer install --no-interaction --ignore-platform-reqs
72+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
73+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
74+
- travis_retry composer install $COMPOSER_ARGS
75+
- composer show --installed
5976

6077
script:
6178
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
4141
"zendframework/zend-uri": "^2.5",
4242
"fabpot/php-cs-fixer": "1.7.*",
43-
"phpunit/PHPUnit": "~4.0"
43+
"phpunit/phpunit": "^4.5"
4444
},
4545
"suggest": {
4646
"zendframework/zend-authentication": "Zend\\Authentication component",

0 commit comments

Comments
 (0)