Skip to content

Commit 0124cfd

Browse files
Merge branch '10.5' into 11.3
2 parents 1410b38 + 9896eaa commit 0124cfd

File tree

3 files changed

+5
-44
lines changed

3 files changed

+5
-44
lines changed

.phpstorm.meta.php

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

ChangeLog-11.3.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ All notable changes of the PHPUnit 11.3 release series are documented in this fi
44

55
## [11.3.2] - 2024-MM-DD
66

7-
### Fixed
8-
9-
* [#5884](https://github.com/sebastianbergmann/phpunit/issues/5884): TestDox printer does not consider that issues can be suppressed by attribute, baseline, source location, or `@` operator
10-
117
### Changed
128

139
* [#5931](https://github.com/sebastianbergmann/phpunit/pull/5931): `name` property on `<testsuites>` element in JUnit XML logfile
10+
* Removed `.phpstorm.meta.php` file as methods such as `TestCase::createStub()` use generics / template types for their return types and PhpStorm, for example, uses that information
11+
12+
### Fixed
13+
14+
* [#5884](https://github.com/sebastianbergmann/phpunit/issues/5884): TestDox printer does not consider that issues can be suppressed by attribute, baseline, source location, or `@` operator
1415

1516
## [11.3.1] - 2024-08-13
1617

build.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,6 @@
341341
<replace file="${basedir}/build/tmp/phar-scoped/phpunit/Framework/TestRunner/templates/method.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\CodeCoverage"/>
342342
<replace file="${basedir}/build/tmp/phar-scoped/phpunit/Framework/TestRunner/templates/method.tpl" token="SebastianBergmann\CodeCoverage\Driver\Selector" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\Driver\Selector"/>
343343

344-
<copy file="${basedir}/.phpstorm.meta.php" tofile="${basedir}/build/tmp/phar-scoped/.phpstorm.meta.php"/>
345-
346344
<exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
347345
<arg value="--all" />
348346
<arg value="--tolerant" />

0 commit comments

Comments
 (0)