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

Commit

Permalink
Merge 059cf07 into e4421ea
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Dec 8, 2017
2 parents e4421ea + 059cf07 commit 6f57c83
Show file tree
Hide file tree
Showing 18 changed files with 519 additions and 371 deletions.
49 changes: 7 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,69 +5,44 @@ language: php
cache:
directories:
- $HOME/.composer/cache
- $HOME/.local
- vendor

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
- php: hhvm
- php: 7.2
env:
- DEPS=lowest
- php: hhvm
- php: 7.2
env:
- DEPS=locked
- php: hhvm
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: hhvm

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
- composer show
- stty cols 120 && composer show

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
Expand All @@ -79,13 +54,3 @@ after_script:

notifications:
email: false
irc:
channels:
- "irc.freenode.org#zftalk.dev"
on_success: change
on_failure: always
slack:
rooms:
- secure: "AKzhI+UXy7hDxmfynkloa5xG3Dm13Pc976/IbPUSXHWi+qT9bDtCLpJ42YRW1SNTAD/FthprNSDkwM2MEF5z8+nA75Ahs+ZFHrDT1GWgu/AuRgDqCfBMbWZUNpqiwIN0FLyTF7owzwNZFHYsS8JykPelj1fOuYOhfUQebrz4ZsqTfYynclnppN4C6IhDRvANVxYpKIj7OEY6lL1rolXmz2BS+jGBC9fZZth67ge5SCs9t6j7r0EuoE4ng9i2pV5oEmNoz92AnXQ7HXtLhjME1oSbL5j+JpFFE7jz9AFJifzfDwT06RqOYGeS96S+Olcn8sHKTrQQp+dbvY5IpD0qEBiQFaJr9AYI+Rf5xHSAxvduPXmb3kKbMBudSf6kiLa+AwmC98ecVYp1TRZzuqKgBh3mGE3I/8hgVgxShyEae+aYRcpHtn0DnK3xCM96TvT8cKpZY/ziYhWpf79KBjj1mV4kErJdbnOqLGwtjPbi9YfsiOgz2sCFo75dBxzOhZscXGx9LY/WPJueJJzTnuzx89GxTnwhpKnBivU9yi2N0iVwV7Il0087/dr2H6uT4DpC4Rn3gSy11J1wyV4UAgJjjShhcu6zxiMf4stBFbnPFBVMhXPAYbGALP3dG8Wt//tKsS0tD9PwLgYojMvKYUbpOjSFk0b9WhrYIGdKfd00hOk="
on_success: change
on_failure: always
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
}
},
"require": {
"php": "^5.6 || ^7.0"
"php": "^7.1"
},
"require-dev": {
"malukenho/docheader": "^0.1.5",
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
"malukenho/docheader": "^0.1.6",
"phpunit/phpunit": "^6.5.3",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
Expand All @@ -32,9 +32,9 @@
}
},
"suggest": {
"zendframework/zend-expressive-platesrenderer": "^1.2.1 to use the Plates template renderer",
"zendframework/zend-expressive-twigrenderer": "^1.3 to use the Twig template renderer",
"zendframework/zend-expressive-zendviewrenderer": "^1.3 to use the zend-view PhpRenderer template renderer"
"zendframework/zend-expressive-platesrenderer": "^2.0 to use the Plates template renderer",
"zendframework/zend-expressive-twigrenderer": "^2.0 to use the Twig template renderer",
"zendframework/zend-expressive-zendviewrenderer": "^2.0 to use the zend-view PhpRenderer template renderer"
},
"scripts": {
"check": [
Expand Down

0 comments on commit 6f57c83

Please sign in to comment.