Rename methods

sebastianbergmann · sebastianbergmann · commit e5138ca07576 · 2025-03-29T10:37:58.000+01:00
diff --git a/ChangeLog-12.1.md b/ChangeLog-12.1.md
@@ -8,7 +8,7 @@ All notable changes of the PHPUnit 12.1 release series are documented in this fi
 
 * [#6118](https://github.com/sebastianbergmann/phpunit/pull/6118): `expectErrorLog()` for expecting `error_log()` output
 * [#6126](https://github.com/sebastianbergmann/phpunit/pull/6126): Attribute `#[WithEnvironmentVariable]` for setting an environment variable for the duration of a test
-* The `AfterTestMethodCalled`, `AfterTestMethodErrored`, `AfterTestMethodFinished`, `BeforeTestMethodCalled`, `BeforeTestMethodErrored`, `BeforeTestMethodFinished`, `PostConditionCalled`, `PostConditionErrored`, `PostConditionFinished`, `PreConditionCalled`, `PreConditionErrored`, and `PreConditionFinished` event value objects now have `test()` method that returns a value object representing the test method for which the hook method was called
+* The `AfterTestMethodCalled`, `AfterTestMethodErrored`, `AfterTestMethodFinished`, `BeforeTestMethodCalled`, `BeforeTestMethodErrored`, `BeforeTestMethodFinished`, `PostConditionCalled`, `PostConditionErrored`, `PostConditionFinished`, `PreConditionCalled`, `PreConditionErrored`, and `PreConditionFinished` event value objects now have a method named `testMethod()` that returns a value object representing the test method for which the hook method was called
 
 ### Changed
 
diff --git a/src/Event/Events/Test/HookMethod/AfterTestMethodCalled.php b/src/Event/Events/Test/HookMethod/AfterTestMethodCalled.php
@@ -37,7 +37,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/AfterTestMethodErrored.php b/src/Event/Events/Test/HookMethod/AfterTestMethodErrored.php
@@ -41,7 +41,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/AfterTestMethodFinished.php b/src/Event/Events/Test/HookMethod/AfterTestMethodFinished.php
@@ -42,7 +42,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/BeforeTestMethodCalled.php b/src/Event/Events/Test/HookMethod/BeforeTestMethodCalled.php
@@ -37,7 +37,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/BeforeTestMethodErrored.php b/src/Event/Events/Test/HookMethod/BeforeTestMethodErrored.php
@@ -41,7 +41,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/BeforeTestMethodFinished.php b/src/Event/Events/Test/HookMethod/BeforeTestMethodFinished.php
@@ -42,7 +42,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PostConditionCalled.php b/src/Event/Events/Test/HookMethod/PostConditionCalled.php
@@ -37,7 +37,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PostConditionErrored.php b/src/Event/Events/Test/HookMethod/PostConditionErrored.php
@@ -41,7 +41,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PostConditionFinished.php b/src/Event/Events/Test/HookMethod/PostConditionFinished.php
@@ -42,7 +42,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PreConditionCalled.php b/src/Event/Events/Test/HookMethod/PreConditionCalled.php
@@ -37,7 +37,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PreConditionErrored.php b/src/Event/Events/Test/HookMethod/PreConditionErrored.php
@@ -41,7 +41,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/src/Event/Events/Test/HookMethod/PreConditionFinished.php b/src/Event/Events/Test/HookMethod/PreConditionFinished.php
@@ -42,7 +42,7 @@ public function telemetryInfo(): Telemetry\Info
         return $this->telemetryInfo;
     }
 
-    public function test(): Code\TestMethod
+    public function testMethod(): Code\TestMethod
     {
         return $this->test;
     }
diff --git a/tests/unit/Event/Emitter/DispatchingEmitterTest.php b/tests/unit/Event/Emitter/DispatchingEmitterTest.php
@@ -1037,7 +1037,7 @@ public function notify(Test\BeforeTestMethodCalled $event): void
 
         $this->assertInstanceOf(Test\BeforeTestMethodCalled::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
 
@@ -1081,7 +1081,7 @@ public function notify(Test\BeforeTestMethodErrored $event): void
 
         $this->assertInstanceOf(Test\BeforeTestMethodErrored::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
     }
@@ -1124,7 +1124,7 @@ public function notify(Test\BeforeTestMethodFinished $event): void
 
         $this->assertInstanceOf(Test\BeforeTestMethodFinished::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame([$calledMethod], $event->calledMethods());
     }
 
@@ -1166,7 +1166,7 @@ public function notify(Test\PreConditionCalled $event): void
 
         $this->assertInstanceOf(Test\PreConditionCalled::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
 
@@ -1210,7 +1210,7 @@ public function notify(Test\PreConditionErrored $event): void
 
         $this->assertInstanceOf(Test\PreConditionErrored::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
     }
@@ -1253,7 +1253,7 @@ public function notify(Test\PreConditionFinished $event): void
 
         $this->assertInstanceOf(Test\PreConditionFinished::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame([$calledMethod], $event->calledMethods());
     }
 
@@ -2388,7 +2388,7 @@ public function notify(Test\PostConditionCalled $event): void
 
         $this->assertInstanceOf(Test\PostConditionCalled::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
 
@@ -2432,7 +2432,7 @@ public function notify(Test\PostConditionErrored $event): void
 
         $this->assertInstanceOf(Test\PostConditionErrored::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
     }
@@ -2475,7 +2475,7 @@ public function notify(Test\PostConditionFinished $event): void
 
         $this->assertInstanceOf(Test\PostConditionFinished::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame([$calledMethod], $event->calledMethods());
     }
 
@@ -2517,7 +2517,7 @@ public function notify(Test\AfterTestMethodCalled $event): void
 
         $this->assertInstanceOf(Test\AfterTestMethodCalled::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
 
@@ -2561,7 +2561,7 @@ public function notify(Test\AfterTestMethodErrored $event): void
 
         $this->assertInstanceOf(Test\AfterTestMethodErrored::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
     }
@@ -2604,7 +2604,7 @@ public function notify(Test\AfterTestMethodFinished $event): void
 
         $this->assertInstanceOf(Test\AfterTestMethodFinished::class, $event);
 
-        $this->assertSame($testMethod, $event->test());
+        $this->assertSame($testMethod, $event->testMethod());
         $this->assertSame([$calledMethod], $event->calledMethods());
     }
 
diff --git a/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodCalledTest.php b/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodCalledTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodErroredTest.php b/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodErroredTest.php
@@ -34,7 +34,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
diff --git a/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodFinishedTest.php b/tests/unit/Event/Events/Test/HookMethod/AfterTestMethodFinishedTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethods, $event->calledMethods());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodCalledTest.php b/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodCalledTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodErroredTest.php b/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodErroredTest.php
@@ -34,7 +34,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
diff --git a/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodFinishedTest.php b/tests/unit/Event/Events/Test/HookMethod/BeforeTestMethodFinishedTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethods, $event->calledMethods());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/PostConditionCalledTest.php b/tests/unit/Event/Events/Test/HookMethod/PostConditionCalledTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/PostConditionErroredTest.php b/tests/unit/Event/Events/Test/HookMethod/PostConditionErroredTest.php
@@ -34,7 +34,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
diff --git a/tests/unit/Event/Events/Test/HookMethod/PostConditionFinishedTest.php b/tests/unit/Event/Events/Test/HookMethod/PostConditionFinishedTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethods, $event->calledMethods());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/PreConditionCalledTest.php b/tests/unit/Event/Events/Test/HookMethod/PreConditionCalledTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
     }
diff --git a/tests/unit/Event/Events/Test/HookMethod/PreConditionErroredTest.php b/tests/unit/Event/Events/Test/HookMethod/PreConditionErroredTest.php
@@ -34,7 +34,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethod, $event->calledMethod());
         $this->assertSame($throwable, $event->throwable());
diff --git a/tests/unit/Event/Events/Test/HookMethod/PreConditionFinishedTest.php b/tests/unit/Event/Events/Test/HookMethod/PreConditionFinishedTest.php
@@ -31,7 +31,7 @@ public function testConstructorSetsValues(): void
         );
 
         $this->assertSame($telemetryInfo, $event->telemetryInfo());
-        $this->assertSame($test, $event->test());
+        $this->assertSame($test, $event->testMethod());
         $this->assertSame('FooTest', $event->testClassName());
         $this->assertSame($calledMethods, $event->calledMethods());
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function telemetryInfo(): Telemetry\Info`
`37`	`37`	`return $this->telemetryInfo;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function test(): Code\TestMethod`
	`40`	`+ public function testMethod(): Code\TestMethod`
`41`	`41`	`{`
`42`	`42`	`return $this->test;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function telemetryInfo(): Telemetry\Info`
`41`	`41`	`return $this->telemetryInfo;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function test(): Code\TestMethod`
	`44`	`+ public function testMethod(): Code\TestMethod`
`45`	`45`	`{`
`46`	`46`	`return $this->test;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function telemetryInfo(): Telemetry\Info`
`42`	`42`	`return $this->telemetryInfo;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function test(): Code\TestMethod`
	`45`	`+ public function testMethod(): Code\TestMethod`
`46`	`46`	`{`
`47`	`47`	`return $this->test;`
`48`	`48`	`}`