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

Commit ef89962

Browse files
authored
Merge pull request #114 from webimpress/feature/phpunit
Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2
2 parents e8e6491 + ef92854 commit ef89962

File tree

62 files changed

+1339
-892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1339
-892
lines changed

.travis.yml

+12-28
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ cache:
1515

1616
env:
1717
global:
18-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
18+
- COMPOSER_ARGS="--no-interaction"
19+
- COVERAGE_DEPS="satooshi/php-coveralls"
1920
- TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT=true
2021
- SITE_URL="https://zendframework.github.io/zend-code"
2122
- GH_USER_NAME="Matthew Weier O'Phinney"
@@ -25,48 +26,30 @@ env:
2526

2627
matrix:
2728
include:
28-
- php: 5.6
29+
- php: 7.1
2930
env:
3031
- DEPS=lowest
31-
- php: 5.6
32+
- php: 7.1
3233
env:
3334
- DEPS=locked
3435
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
3536
- PATH="$HOME/.local/bin:$PATH"
3637
- TEST_COVERAGE=true
37-
- php: 5.6
38-
env:
39-
- DEPS=latest
40-
- php: 7
41-
env:
42-
- DEPS=lowest
43-
- php: 7
44-
env:
45-
- DEPS=locked
4638
- CHECK_CS=true
47-
- php: 7
48-
env:
49-
- DEPS=latest
50-
- php: 7.1
51-
env:
52-
- DEPS=lowest
53-
- php: 7.1
54-
env:
55-
- DEPS=locked
5639
- php: 7.1
5740
env:
5841
- DEPS=latest
59-
- php: hhvm
42+
- php: nightly
6043
env:
6144
- DEPS=lowest
62-
- php: hhvm
45+
- php: nightly
6346
env:
6447
- DEPS=locked
65-
- php: hhvm
48+
- php: nightly
6649
env:
6750
- DEPS=latest
6851
allow_failures:
69-
- php: hhvm
52+
- php: nightly
7053

7154
notifications:
7255
irc: "irc.freenode.org#zftalk.dev"
@@ -78,10 +61,11 @@ before_install:
7861

7962
install:
8063
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
81-
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
82-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
64+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
8366
- travis_retry composer install $COMPOSER_ARGS
84-
- composer show
67+
- stty cols 120
68+
- COLUMNS=120 composer show
8569

8670
script:
8771
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"require": {
16-
"php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6",
16+
"php": "^7.1",
1717
"zendframework/zend-eventmanager": "^2.6 || ^3.0"
1818
},
1919
"require-dev": {
2020
"ext-phar": "*",
2121
"doctrine/annotations": "~1.0",
2222
"zendframework/zend-stdlib": "^2.7 || ^3.0",
2323
"squizlabs/php_codesniffer": "^2.5",
24-
"phpunit/PHPUnit": "^4.8.21"
24+
"phpunit/phpunit": "^6.2.2"
2525
},
2626
"suggest": {
2727
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",

0 commit comments

Comments
 (0)