From 969cdbaee6268e37b4fc04241e337f8c4335f2d1 Mon Sep 17 00:00:00 2001 From: Tim Younger Date: Tue, 5 Jul 2016 13:12:04 -0700 Subject: [PATCH] add travis-ci builds on latest versions of dependencies. this package is not compatible with ZF3, so i have made that explicit. --- .gitignore | 1 + .travis.yml | 43 +++++++++++++++++ README.md | 2 + composer.json | 47 ++++++++++++------- .../Diagnostics/DiagnosticsControllerTest.php | 2 + .../Reporter/VerboseConsoleTest.php | 1 - 6 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 .travis.yml diff --git a/.gitignore b/.gitignore index 63f46ab..15cbb3a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ composer.phar .*.sw* .*.un~ vendor/ +clover.xml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..156c98a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,43 @@ +sudo: false + +language: php + +cache: + directories: + - $HOME/.composer/cache + +env: + global: + - COMPOSER_ARGS="--no-interaction" + - SITE_URL: https://zendframework.github.io/ZFTool + - GH_REF: github.com/zendframework/ZFTool.git + +matrix: + fast_finish: true + include: + - php: 5.3 + - php: 5.4 + - php: 5.5 + - php: 5.6 + env: + - EXECUTE_CS_CHECK=true + - TEST_COVERAGE=true + - php: 7 + - php: hhvm + +before_install: + - travis_retry composer self-update + +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 + - travis_retry composer install $COMPOSER_ARGS + - composer show --installed + +script: + - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs-check ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi + - if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi + +notifications: + email: true \ No newline at end of file diff --git a/README.md b/README.md index b93d519..3c72d8b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Zend Framework 2 Tool ========================= +[![Build Status](https://secure.travis-ci.org/zendframework/ZFTool.svg?branch=master)](https://secure.travis-ci.org/zendframework/ZFTool) + **ZFTool** is an utility module for maintaining modular Zend Framework 2 applications. It runs from the command line and can be installed as ZF2 module or as PHAR (see below). diff --git a/composer.json b/composer.json index 688e637..98339e3 100644 --- a/composer.json +++ b/composer.json @@ -21,27 +21,38 @@ "require": { "php": ">=5.3.3", "zendframework/zenddiagnostics" : ">=1.0.0", - "zendframework/zend-code": ">=2.2.2", - "zendframework/zend-config": ">=2.2.2", - "zendframework/zend-console": ">=2.2.2", - "zendframework/zend-file": ">=2.2.2", - "zendframework/zend-form": ">=2.2.2", - "zendframework/zend-i18n": ">=2.2.2", - "zendframework/zend-loader": ">=2.2.2", - "zendframework/zend-log": ">=2.2.2", - "zendframework/zend-modulemanager": ">=2.2.2", - "zendframework/zend-mvc": ">=2.2.2", - "zendframework/zend-serializer": ">=2.2.2", - "zendframework/zend-servicemanager": ">=2.2.2", - "zendframework/zend-stdlib": ">=2.2.2", - "zendframework/zend-text": ">=2.2.2", - "zendframework/zend-version": ">=2.2.2 ", - "zendframework/zend-view": ">=2.2.2", - "zendframework/zend-http": ">=2.2.2" + "zendframework/zend-code": "^2.2.2", + "zendframework/zend-config": "^2.2.2", + "zendframework/zend-console": "^2.2.2", + "zendframework/zend-file": "^2.2.2", + "zendframework/zend-form": "^2.2.2", + "zendframework/zend-i18n": "^2.2.2", + "zendframework/zend-loader": "^2.2.2", + "zendframework/zend-log": "^2.2.2", + "zendframework/zend-modulemanager": "^2.2.2", + "zendframework/zend-mvc": "^2.2.2", + "zendframework/zend-serializer": "^2.2.2", + "zendframework/zend-servicemanager": "^2.2.2", + "zendframework/zend-stdlib": "^2.2.2", + "zendframework/zend-text": "^2.2.2", + "zendframework/zend-version": "^2.2.2 ", + "zendframework/zend-view": "^2.2.2", + "zendframework/zend-http": "^2.2.2" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^4.8", + "zendframework/zend-mvc": "^2.2" + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run", + "cs-fix": "php-cs-fixer fix -v", + "test": "phpunit --configuration tests", + "test-coverage": "phpunit --configuration tests --coverage-text --coverage-clover clover.xml" }, "bin": ["zf.php"] } diff --git a/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php b/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php index cded7ee..73672b9 100644 --- a/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php +++ b/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php @@ -60,6 +60,8 @@ class DiagnosticsControllerTest extends \PHPUnit_Framework_TestCase public function setup() { + \PHPUnit_Framework_Error_Deprecated::$enabled = false; + $this->config = new ArrayObject(array( 'diagnostics' => array() )); diff --git a/tests/ZFToolTest/Diagnostics/Reporter/VerboseConsoleTest.php b/tests/ZFToolTest/Diagnostics/Reporter/VerboseConsoleTest.php index c22c548..87d05de 100644 --- a/tests/ZFToolTest/Diagnostics/Reporter/VerboseConsoleTest.php +++ b/tests/ZFToolTest/Diagnostics/Reporter/VerboseConsoleTest.php @@ -204,7 +204,6 @@ public function testDataDump() ' )' . PHP_EOL . ' ---------------------------------' . PHP_EOL, ob_get_clean() ); - ob_start(); } public function testSummaryAllSuccessful()