Skip to content

Commit

Permalink
Merge pull request #5580 from doctrine/hotfix/move-from-coveralls-to-…
Browse files Browse the repository at this point in the history
…scrutinizer-coverage

Move from coveralls to scrutinizer coverage
  • Loading branch information
Ocramius committed Dec 29, 2015
2 parents 3ca6828 + 4378744 commit b22cdab
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 6 deletions.
34 changes: 34 additions & 0 deletions .scrutinizer.yml
@@ -0,0 +1,34 @@
before_commands:
- "composer install --no-dev --prefer-source"

tools:
external_code_coverage:
timeout: 3600
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
7 changes: 4 additions & 3 deletions .travis.yml
Expand Up @@ -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

Expand All @@ -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 = '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:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -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": {
Expand All @@ -24,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"
Expand Down

0 comments on commit b22cdab

Please sign in to comment.