Skip to content

Commit c1e80d4

Browse files
dvdougdvdoug
committed
Remove compat layer
1 parent dd8ea4a commit c1e80d4

File tree

11 files changed

+26
-252
lines changed

11 files changed

+26
-252
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@ jobs:
1717
php-version:
1818
- "7.4"
1919
- "7.3"
20-
- "7.2"
21-
- "7.1"
2220

2321
php-code-coverage-version:
2422
- "^9.0"
25-
- "^8.0"
26-
- "^7.0.2"
27-
- "^6.0.1"
2823

2924
symfony-version:
3025
- "^5.0"
@@ -39,34 +34,6 @@ jobs:
3934
- php-version: "8.0"
4035
dependencies: "force_latest"
4136

42-
exclude:
43-
- php-version: "8.0"
44-
php-code-coverage-version: "^8.0"
45-
46-
- php-version: "8.0"
47-
php-code-coverage-version: "^7.0.2"
48-
49-
- php-version: "8.0"
50-
php-code-coverage-version: "^6.0.1"
51-
52-
- php-version: "7.2"
53-
php-code-coverage-version: "^9.0"
54-
55-
- php-version: "7.2"
56-
php-code-coverage-version: "^8.0"
57-
58-
- php-version: "7.1"
59-
symfony-version: "^5.0"
60-
61-
- php-version: "7.1"
62-
php-code-coverage-version: "^9.0"
63-
64-
- php-version: "7.1"
65-
php-code-coverage-version: "^8.0"
66-
67-
- php-version: "7.1"
68-
php-code-coverage-version: "^7.0.2"
69-
7037
steps:
7138
- uses: actions/checkout@v2
7239

@@ -124,18 +91,13 @@ jobs:
12491

12592
- name: PHPUnit (Xdebug)
12693
run: |
127-
if [ "${{ matrix.php-code-coverage-version }}" = "^9.0" ]; then
128-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-xdebug.xml --path-coverage;
129-
else
130-
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-xdebug.xml;
131-
fi;
94+
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_xdebug php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-xdebug.xml --path-coverage;
13295
if [ "${{ matrix.php-version }}" = "7.4" ]; then
13396
wget https://scrutinizer-ci.com/ocular.phar;
13497
php ocular.phar code-coverage:upload --format=php-clover coverage-xdebug.xml;
13598
fi;
13699
137100
- name: PHPUnit (PCOV)
138-
if: matrix.php-code-coverage-version != '^6.0.1'
139101
run: docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_pcov php vendor/phpunit/phpunit/phpunit --coverage-clover=coverage-pcov.xml;
140102
if [ "${{ matrix.php-version }}" = "7.4" ]; then
141103
wget https://scrutinizer-ci.com/ocular.phar;
@@ -154,7 +116,6 @@ jobs:
154116
fi;
155117
156118
- name: Behat (PCOV)
157-
if: matrix.php-code-coverage-version != '^6.0.1'
158119
run: |
159120
docker-compose -f tests/docker/php${{ matrix.php-version }}/docker-compose.yml exec -T php_fpm_pcov php vendor/behat/behat/bin/behat --strict;
160121
if [ "${{ matrix.php-version }}" = "7.4" ]; then

‎.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ checks:
33

44
tools:
55
external_code_coverage:
6-
runs: 48 # Scrutinizer will wait for 48 code coverage submissions
6+
runs: 6 # Scrutinizer will wait for 6 code coverage submissions
77
timeout: 600 # Timeout in seconds.
88

99
filter:

‎composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,19 @@
2525
}
2626
],
2727
"require": {
28-
"php": "^7.1 || ^8.0",
28+
"php": "^7.3 || ^8.0",
29+
"composer-runtime-api": "^2.0",
2930
"behat/behat": "^3.5",
30-
"phpunit/php-code-coverage": "^6.0.1||^7.0.2||^8.0||^9.0",
31+
"phpunit/php-code-coverage": "^9.0",
3132
"symfony/console": "^3.4||^4.0||^5.0",
3233
"symfony/config": "^3.4||^4.0||^5.0",
3334
"symfony/dependency-injection": "^3.4||^4.0||^5.0",
3435
"symfony/event-dispatcher": "^3.4||^4.0||^5.0"
3536
},
3637
"require-dev": {
37-
"friendsofphp/php-cs-fixer": "^2.16.3",
38-
"phpunit/phpunit": "^7.0||^8.0||^9.0",
38+
"friendsofphp/php-cs-fixer": "^2.16.4",
39+
"phpspec/prophecy-phpunit": "^2.0",
40+
"phpunit/phpunit": "^9.3",
3941
"symfony/filesystem": "^3.4||^4.0||^5.0"
4042
},
4143
"suggest": {

‎phpunit.xml.dist

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/schema/9.3.xsd"
66
colors="true"
77
bootstrap="vendor/autoload.php"
88
>
@@ -13,15 +13,17 @@
1313
</testsuite>
1414
</testsuites>
1515

16-
<filter>
17-
<whitelist processUncoveredFilesFromWhitelist="false">
18-
<directory suffix=".php">src</directory>
19-
</whitelist>
20-
</filter>
16+
<coverage processUncoveredFiles="false">
2117

22-
<logging>
23-
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
24-
<log type="coverage-html" target="build/coverage" showUncoveredFiles="true"/>
25-
</logging>
18+
<include>
19+
<directory>src</directory>
20+
</include>
21+
22+
<report>
23+
<html outputDirectory="build/coverage"/>
24+
<text outputFile="php://stdout" showUncoveredFiles="true"/>
25+
</report>
26+
27+
</coverage>
2628

2729
</phpunit>

‎src/Extension.php

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
use SebastianBergmann\CodeCoverage\Filter;
2020
use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverAvailableException;
2121
use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverWithPathCoverageSupportAvailableException;
22-
use SebastianBergmann\CodeCoverage\RuntimeException;
2322
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
2423
use Symfony\Component\Config\FileLocator;
2524
use Symfony\Component\Console\Input\InputInterface;
@@ -190,7 +189,7 @@ public function process(ContainerBuilder $container): void
190189
$filterDefinition = $container->getDefinition(Filter::class);
191190
$codeCoverageDefinition->setFactory([new Reference(self::class), 'initCodeCoverage']);
192191
$codeCoverageDefinition->setArguments([$filterDefinition, $filterConfig, $branchPathConfig, $output]);
193-
} catch (NoCodeCoverageDriverAvailableException | RuntimeException $e) {
192+
} catch (NoCodeCoverageDriverAvailableException $e) {
194193
$output->writeln('<comment>No code coverage driver is available</comment>');
195194
$canCollectCodeCoverage = false;
196195
}
@@ -201,16 +200,6 @@ public function process(ContainerBuilder $container): void
201200
}
202201

203202
public function initCodeCoverage(Filter $filter, array $filterConfig, ?bool $branchPathConfig, OutputInterface $output): CodeCoverage
204-
{
205-
$driverClassReflection = new \ReflectionClass(Driver::class);
206-
if ($driverClassReflection->isInterface()) {
207-
return $this->initCodeCoverageV678($filter, $filterConfig, $branchPathConfig, $output);
208-
}
209-
210-
return $this->initCodeCoverageV9($filter, $filterConfig, $branchPathConfig, $output);
211-
}
212-
213-
public function initCodeCoverageV9(Filter $filter, array $filterConfig, ?bool $branchPathConfig, OutputInterface $output): CodeCoverage
214203
{
215204
// set up filter
216205
array_walk($filterConfig['include']['directories'], static function (array $dir, string $path, Filter $filter): void {
@@ -259,36 +248,4 @@ public function initCodeCoverageV9(Filter $filter, array $filterConfig, ?bool $b
259248

260249
return $codeCoverage;
261250
}
262-
263-
public function initCodeCoverageV678(Filter $filter, array $config, ?bool $branchPathConfig, OutputInterface $output): CodeCoverage
264-
{
265-
if ($branchPathConfig === true) { //only warn if explicitly enabled
266-
$output->writeln('<info>php-code-coverage v9+ is needed to support collecting branch and path data</info>');
267-
}
268-
269-
// set up filter
270-
array_walk($config['include']['directories'], static function (array $dir, string $path, Filter $filter): void {
271-
$filter->addDirectoryToWhitelist($path, $dir['suffix'], $dir['prefix']);
272-
}, $filter);
273-
274-
array_walk($config['include']['files'], static function (string $file, string $key, Filter $filter): void {
275-
$filter->addFileToWhitelist($file);
276-
}, $filter);
277-
278-
array_walk($config['exclude']['directories'], static function (array $dir, string $path, Filter $filter): void {
279-
$filter->removeDirectoryFromWhitelist($path, $dir['suffix'], $dir['prefix']);
280-
}, $filter);
281-
282-
array_walk($config['exclude']['files'], static function (string $file, string $key, Filter $filter): void {
283-
$filter->removeFileFromWhitelist($file);
284-
}, $filter);
285-
286-
// and init coverage
287-
$codeCoverage = new CodeCoverage(null, $filter);
288-
289-
$codeCoverage->setAddUncoveredFilesFromWhitelist($config['includeUncoveredFiles']);
290-
$codeCoverage->setProcessUncoveredFilesFromWhitelist($config['processUncoveredFiles']);
291-
292-
return $codeCoverage;
293-
}
294251
}

‎src/Service/ReportService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace DVDoug\Behat\CodeCoverage\Service;
1313

14+
use Composer\InstalledVersions;
1415
use SebastianBergmann\CodeCoverage\CodeCoverage;
1516
use SebastianBergmann\CodeCoverage\Report\Clover;
1617
use SebastianBergmann\CodeCoverage\Report\Crap4j;
@@ -59,7 +60,7 @@ public function generateReport(CodeCoverage $coverage): void
5960
$config['lowUpperBound'],
6061
$config['highLowerBound'],
6162
\sprintf(' and <a href="https://github.com/dvdoug/behat-code-coverage">behat-code-coverage %s</a>',
62-
'5.0.0'
63+
InstalledVersions::getPrettyVersion('dvdoug/behat-code-coverage')
6364
));
6465
$report->process($coverage, $config['target']);
6566
break;

‎tests/EventSubscriberTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use DVDoug\Behat\CodeCoverage\Service\ReportService;
1212
use DVDoug\Behat\CodeCoverage\Subscriber\EventSubscriber;
1313
use PHPUnit\Framework\TestCase;
14+
use Prophecy\PhpUnit\ProphecyTrait;
1415
use SebastianBergmann\CodeCoverage\CodeCoverage;
1516
use SebastianBergmann\CodeCoverage\Driver\Driver;
1617
use SebastianBergmann\CodeCoverage\Filter;
@@ -19,6 +20,8 @@
1920

2021
class EventSubscriberTest extends TestCase
2122
{
23+
use ProphecyTrait;
24+
2225
public function testCanSubscribeToEvents(): void
2326
{
2427
$eventSubscriber = new EventSubscriber(new ReportService([]));

‎tests/docker/php7.1/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎tests/docker/php7.1/docker-compose.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎tests/docker/php7.2/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)