From ba00153b2e669ea95754d1c3213d8f24545781d3 Mon Sep 17 00:00:00 2001 From: mpalourdio Date: Thu, 4 Jun 2015 09:27:59 +0200 Subject: [PATCH 1/3] Bump phpunit minimum version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 89e879b1..da10c2e8 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "zendframework/zend-validator": "~2.3" }, "require-dev": { - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~2", "doctrine/coding-standard": "dev-master", "zendframework/zendframework": "~2.3" From e47e4f5dca8a10b8835b91ff502e93036b51b0c0 Mon Sep 17 00:00:00 2001 From: mpalourdio Date: Thu, 4 Jun 2015 09:28:16 +0200 Subject: [PATCH 2/3] Remove minimum-stability flag --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index da10c2e8..348cdd59 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,6 @@ "homepage": "http://www.michaelgallego.fr" } ], - "minimum-stability": "dev", "require": { "php": ">=5.4", "doctrine/common": ">=2.4,<2.6-dev", From bce52e0cf6f71d3f6b026224bc4e67916b2efa04 Mon Sep 17 00:00:00 2001 From: mpalourdio Date: Thu, 4 Jun 2015 20:57:51 +0200 Subject: [PATCH 3/3] Enable code coverage generation and scrutinizer-ci inspections for all php versions except hhvm and php7 --- .travis.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e85c91a6..5d09cfa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ php: - 5.4 - 5.5 - 5.6 - - 7.0 + - 7 - hhvm matrix: allow_failures: - - php: 7.0 + - php: 7 - php: hhvm before_script: @@ -17,12 +17,9 @@ before_script: script: - ./vendor/bin/phpunit --coverage-clover ./build/clover.xml - - '[[ $TRAVIS_PHP_VERSION = hhvm ]] || php build/coverage-checker.php build/clover.xml 70' + - if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php build/coverage-checker.php build/clover.xml 70; fi - ./vendor/bin/phpcs --standard=vendor/doctrine/coding-standard/Doctrine ./src/ ./tests/ after_script: - - | - [[ $TRAVIS_PHP_VERSION = hhvm ]] || { - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml - } + - if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi