From 5849dec16fe49afd09e92f0b9de60ab4fcd49f22 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 16:46:59 +0100 Subject: [PATCH 1/6] Shameless plug --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 27262ec8f..4399acc4f 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,8 @@ {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"}, {"name": "Roman Borschel", "email": "roman@code-factory.org"}, {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"}, - {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} + {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}, + {"name": "Marco Pivetta", "email": "ocramius@gmail.com"} ], "minimum-stability": "dev", "require": { From 86e13f9c5d480dca15e363300715cd2231087567 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 16:47:20 +0100 Subject: [PATCH 2/6] Removing coveralls dependency --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4399acc4f..cd1f81ade 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,7 @@ }, "require-dev": { "symfony/yaml": "~2.3|~3.0", - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "dev-master" + "phpunit/phpunit": "~4.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" From e37e1818c61014e2184e642d3106e4dea5113e5e Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 16:51:44 +0100 Subject: [PATCH 3/6] Adding scrutinizer-ci config --- .scrutinizer.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 000000000..42257449c --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,34 @@ +before_commands: + - "composer install --no-dev --prefer-source" + +tools: + external_code_coverage: + timeout: 1800 + php_code_coverage: + enabled: true + php_code_sniffer: + enabled: false + php_cpd: + enabled: true + excluded_dirs: ["bin", "docs", "tests", "tools", "vendor"] + php_cs_fixer: + enabled: false + php_loc: + enabled: true + excluded_dirs: ["bin", "docs", "tests", "tools", "vendor"] + php_mess_detector: + enabled: true + filter: + paths: ["lib/*"] + php_pdepend: + enabled: true + excluded_dirs: ["docs", "examples", "tests", "vendor"] + php_analyzer: + enabled: true + filter: + paths: ["lib/*", "tests/*"] + php_hhvm: + enabled: true + filter: + paths: ["lib/*", "tests/*"] + sensiolabs_security_checker: true From 3e87a1c4b8dff88622f607d441ed2479f0ce2e54 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 16:54:36 +0100 Subject: [PATCH 4/6] Uploading coverage information via `ocular.phar` --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b494da77a..8bb8b5cf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ script: - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional after_script: - - php vendor/bin/coveralls -v + - if [[ $TRAVIS_PHP_VERSION = '5.6' && $DB = 'sqlite' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [[ $TRAVIS_PHP_VERSION = '5.6' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi matrix: include: From 75957ee3e765ee7264b029d1ae1390b29dd254ac Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 17:07:38 +0100 Subject: [PATCH 5/6] We can safely run coverage reporting on PHP7 only --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bb8b5cf6..01f7f35e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ env: - DB=sqlite before_script: - - if [[ $TRAVIS_PHP_VERSION = '5.6' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi - - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi + - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi + - if [[ $TRAVIS_PHP_VERSION != '7.0' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi - composer self-update - composer install --prefer-source @@ -23,8 +23,8 @@ script: - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional after_script: - - if [[ $TRAVIS_PHP_VERSION = '5.6' && $DB = 'sqlite' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - - if [[ $TRAVIS_PHP_VERSION = '5.6' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi + - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi matrix: include: From 43787447d6bafe7f88c556bc90b120f0b8f6369e Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 29 Dec 2015 17:11:14 +0100 Subject: [PATCH 6/6] Test suite is SLOOOOOOOOWWWWWW --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 42257449c..361b21e38 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,7 +3,7 @@ before_commands: tools: external_code_coverage: - timeout: 1800 + timeout: 3600 php_code_coverage: enabled: true php_code_sniffer: