Skip to content

Commit eac2e7e

Browse files
Merge branch '10.5' into 11.5
2 parents 9d60461 + 82c0b24 commit eac2e7e

File tree

7 files changed

+1
-55
lines changed

7 files changed

+1
-55
lines changed

src/Runner/CodeCoverage.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@ public function init(Configuration $configuration, CodeCoverageFilterRegistry $c
116116

117117
$this->deactivate();
118118
}
119-
120-
if (!$configuration->hasCoverageCacheDirectory()) {
121-
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
122-
'No cache directory configured, result of static analysis for code coverage will not be cached',
123-
);
124-
}
125119
}
126120

127121
/**

tests/_files/delete_directory.php

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

tests/end-to-end/event/_files/invalid-coverage-metadata/phpunit.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="../../../../../phpunit.xsd"
4-
cacheDirectory=".phpunit.cache">
3+
xsi:noNamespaceSchemaLocation="../../../../../phpunit.xsd">
54
<testsuites>
65
<testsuite name="default">
76
<directory>tests</directory>

tests/end-to-end/event/invalid-coverage-metadata.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ $_SERVER['argv'][] = '--debug';
1616
require __DIR__ . '/../../bootstrap.php';
1717

1818
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
19-
--CLEAN--
20-
<?php declare(strict_types=1);
21-
require __DIR__ . '/../../_files/delete_directory.php';
22-
23-
delete_directory(__DIR__ . '/_files/invalid-coverage-metadata/.phpunit.cache');
2419
--EXPECTF--
2520
PHPUnit Started (PHPUnit %s using %s)
2621
Test Runner Configured

tests/end-to-end/phar/phpunit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="../../../phpunit.xsd"
4-
cacheDirectory="../../../.phpunit.cache"
54
bootstrap="src/autoload.php"
65
failOnRisky="true"
76
failOnWarning="true">

tests/end-to-end/regression/5218.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ $_SERVER['argv'][] = '--coverage-filter';
1616
$_SERVER['argv'][] = __DIR__ . '/5218/src/';
1717
$_SERVER['argv'][] = '--coverage-text';
1818
$_SERVER['argv'][] = __DIR__ . '/5218/tests/';
19-
$_SERVER['argv'][] = '--cache-directory';
20-
$_SERVER['argv'][] = __DIR__ . '/5218/cache';
2119

2220
require_once __DIR__ . '/../../bootstrap.php';
2321

2422
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
25-
--CLEAN--
26-
<?php declare(strict_types=1);
27-
require __DIR__ . '/../../_files/delete_directory.php';
28-
29-
delete_directory(__DIR__ . '/5218/cache');
3023
--EXPECTF--
3124
PHPUnit %s by Sebastian Bergmann and contributors.
3225

tests/end-to-end/regression/5351.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,10 @@ $_SERVER['argv'][] = '--colors=never';
1212
$_SERVER['argv'][] = '--coverage-text';
1313
$_SERVER['argv'][] = '--configuration';
1414
$_SERVER['argv'][] = __DIR__ . '/5351/phpunit.xml';
15-
$_SERVER['argv'][] = '--cache-directory';
16-
$_SERVER['argv'][] = __DIR__ . '/5351/cache';
1715

1816
require_once __DIR__ . '/../../bootstrap.php';
1917

2018
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
21-
--CLEAN--
22-
<?php declare(strict_types=1);
23-
require __DIR__ . '/../../_files/delete_directory.php';
24-
25-
delete_directory(__DIR__ . '/5351/cache');
2619
--EXPECTF--
2720
PHPUnit %s by Sebastian Bergmann and contributors.
2821

0 commit comments

Comments
 (0)