Skip to content

Commit cf4bddf

Browse files
Merge branch '11.5' into 12.0
2 parents 114c0fc + af757ed commit cf4bddf

File tree

8 files changed

+8
-55
lines changed

8 files changed

+8
-55
lines changed

ChangeLog-12.0.md

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

33
All notable changes of the PHPUnit 12.0 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5+
## [12.0.10] - 2025-MM-DD
6+
7+
### Changed
8+
9+
* [#6150](https://github.com/sebastianbergmann/phpunit/issues/6150): Reverted change introduced in PHPUnit 12.0.8
10+
511
## [12.0.9] - 2025-03-19
612

713
### Fixed
@@ -110,6 +116,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
110116
* [#5801](https://github.com/sebastianbergmann/phpunit/issues/5801): Support for targeting traits with `#[CoversClass]` and `#[UsesClass]` attributes
111117
* [#5978](https://github.com/sebastianbergmann/phpunit/issues/5978): Support for PHP 8.2
112118

119+
[12.0.10]: https://github.com/sebastianbergmann/phpunit/compare/12.0.9...12.0
113120
[12.0.9]: https://github.com/sebastianbergmann/phpunit/compare/12.0.8...12.0.9
114121
[12.0.8]: https://github.com/sebastianbergmann/phpunit/compare/12.0.7...12.0.8
115122
[12.0.7]: https://github.com/sebastianbergmann/phpunit/compare/12.0.6...12.0.7

src/Runner/CodeCoverage.php

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

120120
$this->deactivate();
121121
}
122-
123-
if (!$configuration->hasCoverageCacheDirectory()) {
124-
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
125-
'No cache directory configured, result of static analysis for code coverage will not be cached',
126-
);
127-
}
128122
}
129123

130124
/**

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)