Skip to content

Commit

Permalink
Close #63.
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jan 19, 2011
1 parent 4133070 commit 95e317f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog.markdown
Expand Up @@ -8,6 +8,7 @@ PHPUnit 3.6.0

* Added `assertCount()` and `assertNotCount()` to assert the number of elements in an array as well as `Countable` or `Iterator` objects.
* Added `returnSelf()` to ease the mocking and stubbing of fluent interfaces.
* Implemented GH-63: Invalid `@covers` annotations should produce a test error instead of aborting PHPUnit.
* Implemented GH-82: Test Skeleton Generator should create `@covers` annotations.
* Implemented GH-83: Test errors and failures as well as incomplete and skipped tests now get coloured letters in the test progress.
* Implemented GH-88: `@expectedException` (and `setExpectedException()`) no longer accept `Exception` as the expected exception class.
Expand Down
12 changes: 11 additions & 1 deletion PHPUnit/Framework/TestResult.php
Expand Up @@ -663,7 +663,17 @@ public function run(PHPUnit_Framework_Test $test)
}

if ($useXdebug) {
$this->codeCoverage->stop(!$incomplete && !$skipped);
try {
$this->codeCoverage->stop(!$incomplete && !$skipped);
}

catch (PHP_CodeCoverage_Exception $cce) {
$error = TRUE;

if (!isset($e)) {
$e = $cce;
}
}
}

if ($errorHandlerSet === TRUE) {
Expand Down

0 comments on commit 95e317f

Please sign in to comment.