Merge branch '10.5' into 11.3

sebastianbergmann · Sep 3, 2024 · 0124cfd · 0124cfd
2 parents 1410b38 + 9896eaa
commit 0124cfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 44 deletions.
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
diff --git a/ChangeLog-11.3.md b/ChangeLog-11.3.md
@@ -4,13 +4,14 @@ All notable changes of the PHPUnit 11.3 release series are documented in this fi
 
 ## [11.3.2] - 2024-MM-DD
 
-### Fixed
-
-* [#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
-
 ### Changed
 
 * [#5931](https://github.com/sebastianbergmann/phpunit/pull/5931): `name` property on `<testsuites>` element in JUnit XML logfile
+* 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
+
+### Fixed
+
+* [#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
 
 ## [11.3.1] - 2024-08-13
 

diff --git a/build.xml b/build.xml
@@ -341,8 +341,6 @@
         <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Framework/TestRunner/templates/method.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\CodeCoverage"/>
         <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Framework/TestRunner/templates/method.tpl" token="SebastianBergmann\CodeCoverage\Driver\Selector" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\Driver\Selector"/>
 
-        <copy file="${basedir}/.phpstorm.meta.php" tofile="${basedir}/build/tmp/phar-scoped/.phpstorm.meta.php"/>
-
         <exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--tolerant" />