Fix

sebastianbergmann · sebastianbergmann · commit bbb8cfaf6267 · 2025-01-28T15:56:15.000+01:00
diff --git a/src/Event/Emitter/DispatchingEmitter.php b/src/Event/Emitter/DispatchingEmitter.php
@@ -425,7 +425,7 @@ public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $
     }
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      *
      * @throws InvalidArgumentException
      * @throws UnknownEventTypeException
@@ -477,7 +477,7 @@ public function testPreConditionErrored(string $testClassName, ClassMethod $call
     }
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      *
      * @throws InvalidArgumentException
      * @throws UnknownEventTypeException
@@ -1065,7 +1065,7 @@ public function testPostConditionErrored(string $testClassName, ClassMethod $cal
     }
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      *
      * @throws InvalidArgumentException
      * @throws UnknownEventTypeException
@@ -1117,7 +1117,7 @@ public function testAfterTestMethodErrored(string $testClassName, ClassMethod $c
     }
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      *
      * @throws InvalidArgumentException
      * @throws UnknownEventTypeException
@@ -1169,7 +1169,7 @@ public function testAfterLastTestMethodErrored(string $testClassName, ClassMetho
     }
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      *
      * @throws InvalidArgumentException
      * @throws UnknownEventTypeException
diff --git a/src/Event/Emitter/Emitter.php b/src/Event/Emitter/Emitter.php
@@ -91,7 +91,7 @@ public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $c
     public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
 
@@ -106,7 +106,7 @@ public function testPreConditionCalled(string $testClassName, ClassMethod $calle
     public function testPreConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
 
@@ -267,7 +267,7 @@ public function testPostConditionCalled(string $testClassName, ClassMethod $call
     public function testPostConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
 
@@ -282,7 +282,7 @@ public function testAfterTestMethodCalled(string $testClassName, ClassMethod $ca
     public function testAfterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
 
@@ -297,7 +297,7 @@ public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod
     public function testAfterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
 
diff --git a/src/Event/Events/Test/HookMethod/AfterLastTestMethodErrored.php b/src/Event/Events/Test/HookMethod/AfterLastTestMethodErrored.php
@@ -17,7 +17,7 @@
 use PHPUnit\Event\Telemetry;
 
 /**
- * @psalm-immutable
+ * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
@@ -26,14 +26,14 @@ final class AfterLastTestMethodErrored implements Event
     private readonly Telemetry\Info $telemetryInfo;
 
     /**
-     * @psalm-var class-string
+     * @var class-string
      */
     private readonly string $testClassName;
     private readonly Code\ClassMethod $calledMethod;
     private readonly Throwable $throwable;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function __construct(Telemetry\Info $telemetryInfo, string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable)
     {
@@ -49,7 +49,7 @@ public function telemetryInfo(): Telemetry\Info
     }
 
     /**
-     * @psalm-return class-string
+     * @return class-string
      */
     public function testClassName(): string
     {
diff --git a/src/Event/Events/Test/HookMethod/AfterTestMethodErrored.php b/src/Event/Events/Test/HookMethod/AfterTestMethodErrored.php
@@ -17,7 +17,7 @@
 use PHPUnit\Event\Telemetry;
 
 /**
- * @psalm-immutable
+ * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
@@ -26,14 +26,14 @@ final class AfterTestMethodErrored implements Event
     private readonly Telemetry\Info $telemetryInfo;
 
     /**
-     * @psalm-var class-string
+     * @var class-string
      */
     private readonly string $testClassName;
     private readonly Code\ClassMethod $calledMethod;
     private readonly Throwable $throwable;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function __construct(Telemetry\Info $telemetryInfo, string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable)
     {
@@ -49,7 +49,7 @@ public function telemetryInfo(): Telemetry\Info
     }
 
     /**
-     * @psalm-return class-string
+     * @return class-string
      */
     public function testClassName(): string
     {
diff --git a/src/Event/Events/Test/HookMethod/BeforeTestMethodErrored.php b/src/Event/Events/Test/HookMethod/BeforeTestMethodErrored.php
@@ -17,7 +17,7 @@
 use PHPUnit\Event\Telemetry;
 
 /**
- * @psalm-immutable
+ * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
@@ -26,14 +26,14 @@ final class BeforeTestMethodErrored implements Event
     private readonly Telemetry\Info $telemetryInfo;
 
     /**
-     * @psalm-var class-string
+     * @var class-string
      */
     private readonly string $testClassName;
     private readonly Code\ClassMethod $calledMethod;
     private readonly Throwable $throwable;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function __construct(Telemetry\Info $telemetryInfo, string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable)
     {
@@ -49,7 +49,7 @@ public function telemetryInfo(): Telemetry\Info
     }
 
     /**
-     * @psalm-return class-string
+     * @return class-string
      */
     public function testClassName(): string
     {
diff --git a/src/Event/Events/Test/HookMethod/PostConditionErrored.php b/src/Event/Events/Test/HookMethod/PostConditionErrored.php
@@ -17,7 +17,7 @@
 use PHPUnit\Event\Telemetry;
 
 /**
- * @psalm-immutable
+ * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
@@ -26,14 +26,14 @@ final class PostConditionErrored implements Event
     private readonly Telemetry\Info $telemetryInfo;
 
     /**
-     * @psalm-var class-string
+     * @var class-string
      */
     private readonly string $testClassName;
     private readonly Code\ClassMethod $calledMethod;
     private readonly Throwable $throwable;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function __construct(Telemetry\Info $telemetryInfo, string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable)
     {
@@ -49,7 +49,7 @@ public function telemetryInfo(): Telemetry\Info
     }
 
     /**
-     * @psalm-return class-string
+     * @return class-string
      */
     public function testClassName(): string
     {
diff --git a/src/Event/Events/Test/HookMethod/PreConditionErrored.php b/src/Event/Events/Test/HookMethod/PreConditionErrored.php
@@ -17,7 +17,7 @@
 use PHPUnit\Event\Telemetry;
 
 /**
- * @psalm-immutable
+ * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
@@ -26,14 +26,14 @@ final class PreConditionErrored implements Event
     private readonly Telemetry\Info $telemetryInfo;
 
     /**
-     * @psalm-var class-string
+     * @var class-string
      */
     private readonly string $testClassName;
     private readonly Code\ClassMethod $calledMethod;
     private readonly Throwable $throwable;
 
     /**
-     * @psalm-param class-string $testClassName
+     * @param class-string $testClassName
      */
     public function __construct(Telemetry\Info $telemetryInfo, string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable)
     {
@@ -49,7 +49,7 @@ public function telemetryInfo(): Telemetry\Info
     }
 
     /**
-     * @psalm-return class-string
+     * @return class-string
      */
     public function testClassName(): string
     {
diff --git a/src/TextUI/Configuration/SourceFilter.php b/src/TextUI/Configuration/SourceFilter.php
@@ -19,7 +19,7 @@ final class SourceFilter
     private static ?self $instance = null;
 
     /**
-     * @psalm-var array<non-empty-string, true>
+     * @var array<non-empty-string, true>
      */
     private readonly array $map;
 
@@ -37,7 +37,7 @@ public static function instance(): self
     }
 
     /**
-     * @psalm-param array<non-empty-string, true> $map
+     * @param array<non-empty-string, true> $map
      */
     public function __construct(array $map)
     {

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`/**`
`428`		`- * @psalm-param class-string $testClassName`
	`428`	`+ * @param class-string $testClassName`
`429`	`429`	`*`
`430`	`430`	`* @throws InvalidArgumentException`
`431`	`431`	`* @throws UnknownEventTypeException`
`@@ -477,7 +477,7 @@ public function testPreConditionErrored(string $testClassName, ClassMethod $call`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`/**`
`480`		`- * @psalm-param class-string $testClassName`
	`480`	`+ * @param class-string $testClassName`
`481`	`481`	`*`
`482`	`482`	`* @throws InvalidArgumentException`
`483`	`483`	`* @throws UnknownEventTypeException`
`@@ -1065,7 +1065,7 @@ public function testPostConditionErrored(string $testClassName, ClassMethod $cal`
`1065`	`1065`	`}`
`1066`	`1066`
`1067`	`1067`	`/**`
`1068`		`- * @psalm-param class-string $testClassName`
	`1068`	`+ * @param class-string $testClassName`
`1069`	`1069`	`*`
`1070`	`1070`	`* @throws InvalidArgumentException`
`1071`	`1071`	`* @throws UnknownEventTypeException`
`@@ -1117,7 +1117,7 @@ public function testAfterTestMethodErrored(string $testClassName, ClassMethod $c`
`1117`	`1117`	`}`
`1118`	`1118`
`1119`	`1119`	`/**`
`1120`		`- * @psalm-param class-string $testClassName`
	`1120`	`+ * @param class-string $testClassName`
`1121`	`1121`	`*`
`1122`	`1122`	`* @throws InvalidArgumentException`
`1123`	`1123`	`* @throws UnknownEventTypeException`
`@@ -1169,7 +1169,7 @@ public function testAfterLastTestMethodErrored(string $testClassName, ClassMetho`
`1169`	`1169`	`}`
`1170`	`1170`
`1171`	`1171`	`/**`
`1172`		`- * @psalm-param class-string $testClassName`
	`1172`	`+ * @param class-string $testClassName`
`1173`	`1173`	`*`
`1174`	`1174`	`* @throws InvalidArgumentException`
`1175`	`1175`	`* @throws UnknownEventTypeException`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class SourceFilter`
`19`	`19`	`private static ?self $instance = null;`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * @psalm-var array<non-empty-string, true>`
	`22`	`+ * @var array<non-empty-string, true>`
`23`	`23`	`*/`
`24`	`24`	`private readonly array $map;`
`25`	`25`
`@@ -37,7 +37,7 @@ public static function instance(): self`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @psalm-param array<non-empty-string, true> $map`
	`40`	`+ * @param array<non-empty-string, true> $map`
`41`	`41`	`*/`
`42`	`42`	`public function __construct(array $map)`
`43`	`43`	`{`