PCOV #663
PCOV #663
Conversation
|
@sebastianbergmann anything else needed from me ? |
|
Not that I can think of right now. Just need time to research, review, and decide. |
| - composer self-update | ||
| - composer clear-cache | ||
| - export COMPOSER_ROOT_VERSION=6.1.99 |
There was a problem hiding this comment.
I think this one is still needed, because we still have a circular dep, phpunit depends php-code-coverage
|
|
||
| if ($collect) { | ||
| \pcov\clear(); | ||
| } |
There was a problem hiding this comment.
Looks like the indentation is a bit off here, doesn't it?
There was a problem hiding this comment.
diff --git a/src/CodeCoverage.php b/src/CodeCoverage.php
index 69b4bc0..62e28b4 100644
--- a/src/CodeCoverage.php
+++ b/src/CodeCoverage.php
@@ -13,8 +13,8 @@
use PHPUnit\Runner\PhptTestCase;
use PHPUnit\Util\Test;
use SebastianBergmann\CodeCoverage\Driver\Driver;
-use SebastianBergmann\CodeCoverage\Driver\PHPDBG;
use SebastianBergmann\CodeCoverage\Driver\PCOV;
+use SebastianBergmann\CodeCoverage\Driver\PHPDBG;
use SebastianBergmann\CodeCoverage\Driver\Xdebug;
use SebastianBergmann\CodeCoverage\Node\Builder;
use SebastianBergmann\CodeCoverage\Node\Directory;
@@ -906,9 +906,9 @@ private function selectDriver(Filter $filter): Driver
return new Xdebug($filter);
}
- if ($runtime->hasPCOV()) {
+ if ($runtime->hasPCOV()) {
return new PCOV($filter);
- }
+ }
throw new RuntimeException('No code coverage driver available');
}
diff --git a/src/Driver/PCOV.php b/src/Driver/PCOV.php
index 941650e..12f7643 100644
--- a/src/Driver/PCOV.php
+++ b/src/Driver/PCOV.php
@@ -9,7 +9,6 @@
*/
namespace SebastianBergmann\CodeCoverage\Driver;
-use SebastianBergmann\CodeCoverage\RuntimeException;
use SebastianBergmann\CodeCoverage\Filter;
/**
@@ -21,7 +20,6 @@ final class PCOV implements Driver
{
public function __construct(Filter $filter = null)
{
-
}
/**
@@ -37,19 +35,19 @@ public function start(bool $determineUnusedAndDead = true): void
*/
public function stop(): array
{
- \pcov\stop();
+ \pcov\stop();
- $waiting = \pcov\waiting();
- $collect = [];
+ $waiting = \pcov\waiting();
+ $collect = [];
- if ($waiting) {
- $collect = \pcov\collect(\pcov\inclusive, $waiting);
+ if ($waiting) {
+ $collect = \pcov\collect(\pcov\inclusive, $waiting);
- if ($collect) {
- \pcov\clear();
- }
- }
+ if ($collect) {
+ \pcov\clear();
+ }
+ }
- return $collect;
+ return $collect;
}
}There was a problem hiding this comment.
Ha, sorry - I ran
$ composer global require friendsofphp/php-cs-fixer:^2.14.0
followed by
$ php-cs-fixer fix --diff --verbose
There were some unrelated fixes applied to a test case, which I have removed from the patch above.
There was a problem hiding this comment.
Indentation is off for me too. I think it's caused by the mix of tabs and spaces. Same in CodeCoverage.php.
There was a problem hiding this comment.
Already fixed that locally in a branch where I am preparing this before merging.
There was a problem hiding this comment.
Thanks people, but I'm going to just let Sebastian fix this upon merge, since he has to make minor edits anyway, and I don't want to make any more noise.
There was a problem hiding this comment.
Exactly. Would make things easier for me if this PR would not be altered anymore.
Codecov Report
@@ Coverage Diff @@
## master #663 +/- ##
============================================
+ Coverage 85.16% 86.15% +0.99%
- Complexity 805 806 +1
============================================
Files 32 32
Lines 2534 2536 +2
============================================
+ Hits 2158 2185 +27
+ Misses 376 351 -25
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #663 +/- ##
============================================
+ Coverage 85.16% 86.15% +0.99%
- Complexity 805 806 +1
============================================
Files 32 32
Lines 2534 2536 +2
============================================
+ Hits 2158 2185 +27
+ Misses 376 351 -25
Continue to review full report at Codecov.
|
|
Looks like Travis is happy now. I'll try to find time ASAP to play with PCOV. Thanks for putting all that effort in! |
|
Merged manually. Will be released alongside PHPUnit 8 on Friday. |
|
Hello, Is there a way to test the PCOV driver with PHPUnit 7 or will it be a PHPUnit 8+ only feature ? Thanks |
|
You need PHPUnit 8 for this. |
This is a clean PR for PCOV, with commits separated sensibly.