Skip to content

Commit

Permalink
Fixes zendframework#6829 : fix coveralls error calls comes by phpcov
Browse files Browse the repository at this point in the history
  • Loading branch information
samsonasik committed Nov 3, 2014
1 parent 3e6936d commit 96247ec
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ script:

after_script:
# Merges the individual clover reports of each component into a single clover.xml
- php vendor/bin/phpcov.php --merge --clover build/logs/clover.xml --whitelist library build/coverage
- php vendor/bin/phpcov merge --clover build/logs/clover.xml --whitelist library build/coverage
- php vendor/bin/coveralls

notifications:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ For sensitive email communications, please use [our PGP key](http://framework.ze

To run tests:

- Make sure you have a recent version of PHPUnit installed; 3.7.0
- Make sure you have a recent version of PHPUnit installed; 4.3.4
minimally.
- Enter the `tests/` subdirectory.
- Execute PHPUnit, providing a path to a component directory for which
Expand Down
26 changes: 2 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,6 @@
],
"homepage": "http://framework.zend.com/",
"license": "BSD-3-Clause",
"repositories": [
{
"type": "package",
"package": {
"name": "sebastianbergmann/phpcov",
"version": "1.1.0",
"dist": {
"url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
"type": "zip"
},
"source": {
"url": "https://github.com/sebastianbergmann/phpcov.git",
"type": "git",
"reference": "1.1.0"
},
"bin": [
"phpcov.php"
]
}
}
],
"require": {
"php": ">=5.3.23",
"zendframework/zendxml": "~1.0-dev"
Expand All @@ -39,9 +18,8 @@
"ircmaxell/security-lib": "dev-master",
"mikey179/vfsStream": "1.2.*",
"fabpot/php-cs-fixer": "dev-master#fcbb09b5204",
"phpunit/PHPUnit": "3.7.*",
"satooshi/php-coveralls": "dev-master",
"sebastianbergmann/phpcov": "1.1.0"
"phpunit/phpcov": "2.0.*",
"satooshi/php-coveralls": "dev-master"
},
"suggest": {
"ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
Expand Down
2 changes: 1 addition & 1 deletion tests/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

if (class_exists('PHPUnit_Runner_Version', true)) {
$phpUnitVersion = PHPUnit_Runner_Version::id();
if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '3.7.0', '<')) {
if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '4.3.4', '<')) {
echo 'This version of PHPUnit (' . PHPUnit_Runner_Version::id() . ') is not supported'
. ' in Zend Framework 2.x unit tests. Supported is version 3.7.0 or higher.'
. ' See also: https://github.com/zendframework/zf2/blob/master/CONTRIBUTING.md#running-tests' . PHP_EOL;
Expand Down

0 comments on commit 96247ec

Please sign in to comment.