Skip to content

Commit 299609a

Browse files
committed
phpunit: Allow compatibility with php-code-coverage v11.*
Also require phpunit/php-file-iterator which is used to find the files to include.
1 parent 14ca8bb commit 299609a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"require": {
4646
"php": ">= 7.3",
4747
"phpspec/phpspec": "^6.0 || ^7.0",
48-
"phpunit/php-code-coverage": "^9.2 || ^10.0"
48+
"phpunit/php-code-coverage": "^9.2 || ^10.0 || ^11.0",
49+
"phpunit/php-file-iterator": "^3.0 || ^4.0 || ^5.0"
4950
},
5051
"require-dev": {
5152
"phpstan/phpstan": "^1.5",

src/Listener/CodeCoverageListener.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use SebastianBergmann\CodeCoverage\CodeCoverage;
2222
use SebastianBergmann\CodeCoverage\Report;
2323
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
24+
use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
2425

2526
use function gettype;
2627
use function is_array;
@@ -153,12 +154,16 @@ public function beforeSuite(SuiteEvent $event): void
153154
foreach ($this->options['whitelist'] as $option) {
154155
$settings = $this->filterDirectoryParams($option);
155156

156-
$filter->includeDirectory($settings['directory'], $settings['suffix'], $settings['prefix']);
157+
foreach ((new FileIteratorFacade())->getFilesAsArray($settings['directory'], $settings['suffix'], $settings['prefix']) as $file) {
158+
$filter->includeFile($file);
159+
}
157160
}
158161

159162
foreach ($this->options['blacklist'] as $option) {
160163
$settings = $this->filterDirectoryParams($option);
161-
164+
foreach ((new FileIteratorFacade)->getFilesAsArray($directory, $suffix, $prefix) as $file) {
165+
$filter->excludeFile($file);
166+
}
162167
$filter->excludeDirectory($settings['directory'], $settings['suffix'], $settings['prefix']);
163168
}
164169

0 commit comments

Comments
 (0)