Merge branch '9.6' into 10.5

sebastianbergmann · Nov 25, 2024 · 932e4a1 · 932e4a1
2 parents 00e8e29 + 5e58fee
commit 932e4a1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.2" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.64" installed="3.64.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.65" installed="3.65.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.15" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.8" installed="2.8.3" location="./tools/composer" copy="true"/>

diff --git a/src/Event/Events/Test/Lifecycle/DataProviderMethodFinished.php b/src/Event/Events/Test/Lifecycle/DataProviderMethodFinished.php
@@ -11,7 +11,6 @@
 
 use const PHP_EOL;
 use function sprintf;
-use PHPUnit\Event\Code;
 use PHPUnit\Event\Code\ClassMethod;
 use PHPUnit\Event\Event;
 use PHPUnit\Event\Telemetry;
@@ -49,7 +48,7 @@ public function testMethod(): ClassMethod
     }
 
     /**
-     * @psalm-return list<Code\ClassMethod>
+     * @psalm-return list<ClassMethod>
      */
     public function calledMethods(): array
     {

diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer