From 7193b8ad194860419adf069b41a53eb743399075 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:31:42 +0200 Subject: [PATCH 1/4] updated travis.yml like maintainer template Conflicts: .travis.yml --- .travis.yml | 72 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad367a30..1f9e9341 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,60 +2,72 @@ sudo: false language: php -branches: - except: - - /^release-.*$/ - - /^ghgfk-.*$/ - cache: directories: - $HOME/.composer/cache - - $HOME/.local - - zf-mkdoc-theme - env: global: - - SITE_URL: https://zendframework.github.io/zend-servicemanager - - GH_USER_NAME: "Matthew Weier O'Phinney" - - GH_USER_EMAIL: matthew@weierophinney.net - - GH_REF: github.com/zendframework/zend-servicemanager.git - - secure: "KoLcNj22t668IhAhm5ej6DNf23waoGrZpQ1kmuq5ptTqsXjFjy/cjOJCvWOeRX62Tl2kjc7co9UeK0f91osZ2Wq7HLb+1bIXX5SrB6SfyPUajCQtCtu0xGgEKZfuQwzLWSYoR3tsaD6vqgMjKwwst10d+AyICjdLNu9dHtdu9HpozZtK3kM9+0FwMOiRqFEND2GY05oVYXOrzgu1xNmE1YEGpjKzqqBNpqFOP4W+OnTMRTQcyrlbFzOFvAip7X3GGw9iUSnSzZTnIOWJgMdah8/eFqhrPO8O73faW+/v3ZTxdwupOEZyg7s3TD6+W9rjmN+TgOZEP484PcSlUc6sXA4QM4iL8xthG3bWk8+CDrsnuQmunrXz7T5xUEHs/7B8NuGJ8yT89fMCYGySERKIfCx17+N9kP/848A/+39LE1NIlTxnaPISfm9WMNG67xsEKyJluC/YataPGl0zZ6/7Q7w1oDYvjhsqooUsxKRD2/psd1zrVDJurDa7Ayv/E21u2dIDtbp6w9Zl+he+kwRItMNhtCdzyShqtuY0V/JRmn2lZY2PsfbICRXXAbQnDveNFYz5tE2K40Qm4RWrdZ4cnaLiNJeukdYKVJCFHtZr9rdx1uVeK78Pf5o3rt4S8S1aat35eMZQunc6s4gmeXU5+wIxwXiyOtkdlL3LztSox9s=" + - COMPOSER_ARGS="--no-interaction" + - COVERAGE_DEPS="satooshi/php-coveralls" matrix: include: - php: 5.6 env: + - DEPS=lowest + - php: 5.6 + env: + - DEPS=locked + - LEGACY_DEPS="phpunit/phpunit" + - php: 5.6 + env: + - DEPS=latest + - php: 7 + - DEPS=lowest + - php: 7 + - DEPS=locked - TEST_COVERAGE=true - - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - - PATH="$HOME/.local/bin:$PATH" - php: 7 - env: + - DEPS=latest + - php: 7.1 + - DEPS=lowest + - php: 7.1 + - DEPS=locked - CS_CHECK=true - php: 7.1 - - php: hhvm + - DEPS=latest + - php: 7.2 + - DEPS=lowest + - php: 7.2 + - DEPS=locked + - php: 7.2 + - DEPS=latest + - php: hhvm + - DEPS=lowest + - php: hhvm + - DEPS=locked + - php: hhvm + - DEPS=latest allow_failures: - php: hhvm -notifications: - irc: "irc.freenode.org#zftalk.dev" - email: false - before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi - - composer self-update - - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls:^1.0 ; fi install: - - travis_retry composer install --no-interaction + - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs + - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update --with-dependencies $COMPOSER_ARGS $LEGACY_DEPS ; fi + - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi + - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi + - stty cols 120 && composer show script: - - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi - - if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi - - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi - -after_success: - - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi after_script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi + +notifications: + email: false From a937ff582f86e7e7cef7aa4afe716c8adfdf585d Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 24 Aug 2017 09:50:40 +0200 Subject: [PATCH 2/4] added new line Conflicts: .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1f9e9341..9ab09050 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,3 +71,4 @@ after_script: notifications: email: false + From 234e82853f29498ce3c4c97a4f5e1f0aace217a1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 21 Sep 2017 22:16:37 +0200 Subject: [PATCH 3/4] CS_CHECK rename Conflicts: .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ab09050..72e95329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,4 +71,4 @@ after_script: notifications: email: false - + From 06db4f3cb7cab4108c405b30a58e4c926f1cd3c4 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Nov 2017 12:01:28 -0600 Subject: [PATCH 4/4] Adds CHANGELOG entries for #201 and #202 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4810a3b3..3d95114a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#201](https://github.com/zendframework/zend-servicemanager/pull/201) and + [#202](https://github.com/zendframework/zend-servicemanager/pull/202) add + support for PHP versions 7.1 and 7.2. ### Deprecated