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

Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2 #114

Merged
merged 10 commits into from
Jul 3, 2017
Merged

Bumped PHP to 7.1 and updated PHPUnit to ^6.2.2 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9c6144f
Updated PHUnit to 6.2.2 || 5.7.21
michalbundyra Jul 3, 2017
fa843db
Fix expectException + expectExceptionMessage
michalbundyra Jul 3, 2017
457429d
Bumped PHP version to 7.1
michalbundyra Jul 3, 2017
0a6fa9a
Updated PHPUnit configuration
michalbundyra Jul 3, 2017
e5356cc
Annotation `@expectedException` changed to method call
michalbundyra Jul 3, 2017
3181ea9
Removed PHP5.6 residues
michalbundyra Jul 3, 2017
060b047
Used `$this->` instead of `self::` for PHPUnit assertions
michalbundyra Jul 3, 2017
25fad55
Fixed assertions
michalbundyra Jul 3, 2017
eb360c9
Use ::class notation instead of strings
michalbundyra Jul 3, 2017
ef92854
Drop hhvm build, added PHP 7.2 (nightly) build
michalbundyra Jul 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 12 additions & 28 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ cache:

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

matrix:
include:
- php: 5.6
- php: 7.1
env:
- DEPS=lowest
- php: 5.6
- php: 7.1
env:
- DEPS=locked
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- TEST_COVERAGE=true
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- CHECK_CS=true
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- php: 7.1
env:
- DEPS=latest
- php: hhvm
- php: nightly
env:
- DEPS=lowest
- php: hhvm
- php: nightly
env:
- DEPS=locked
- php: hhvm
- php: nightly
env:
- DEPS=latest
allow_failures:
- php: hhvm
- php: nightly

notifications:
irc: "irc.freenode.org#zftalk.dev"
Expand All @@ -78,10 +61,11 @@ before_install:

install:
- 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 satooshi/php-coveralls:^1.0 ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- travis_retry composer install $COMPOSER_ARGS
- composer show
- stty cols 120
- COLUMNS=120 composer show

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
}
},
"require": {
"php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6",
"php": "^7.1",
"zendframework/zend-eventmanager": "^2.6 || ^3.0"
},
"require-dev": {
"ext-phar": "*",
"doctrine/annotations": "~1.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
"squizlabs/php_codesniffer": "^2.5",
"phpunit/PHPUnit": "^4.8.21"
"phpunit/phpunit": "^6.2.2"
},
"suggest": {
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
Expand Down
Loading