Skip to content

Commit fe53177

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '10.5' into 11.5
2 parents 9923859 + 2cdeaae commit fe53177

File tree

5 files changed

+78
-78
lines changed

5 files changed

+78
-78
lines changed

‎src/Event/Emitter/DispatchingEmitter.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public function testPreparationFailed(Code\Test $test): void
343343
* @throws InvalidArgumentException
344344
* @throws UnknownEventTypeException
345345
*/
346-
public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
346+
public function beforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
347347
{
348348
$this->dispatcher->dispatch(
349349
new Test\BeforeFirstTestMethodCalled(
@@ -360,7 +360,7 @@ public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMeth
360360
* @throws InvalidArgumentException
361361
* @throws UnknownEventTypeException
362362
*/
363-
public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
363+
public function beforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
364364
{
365365
$this->dispatcher->dispatch(
366366
new Test\BeforeFirstTestMethodErrored(
@@ -378,7 +378,7 @@ public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMet
378378
* @throws InvalidArgumentException
379379
* @throws UnknownEventTypeException
380380
*/
381-
public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
381+
public function beforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
382382
{
383383
$this->dispatcher->dispatch(
384384
new Test\BeforeFirstTestMethodFinished(
@@ -395,7 +395,7 @@ public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMe
395395
* @throws InvalidArgumentException
396396
* @throws UnknownEventTypeException
397397
*/
398-
public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
398+
public function beforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
399399
{
400400
$this->dispatcher->dispatch(
401401
new Test\BeforeTestMethodCalled(
@@ -412,7 +412,7 @@ public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $c
412412
* @throws InvalidArgumentException
413413
* @throws UnknownEventTypeException
414414
*/
415-
public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
415+
public function beforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
416416
{
417417
$this->dispatcher->dispatch(
418418
new Test\BeforeTestMethodErrored(
@@ -430,7 +430,7 @@ public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $
430430
* @throws InvalidArgumentException
431431
* @throws UnknownEventTypeException
432432
*/
433-
public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
433+
public function beforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
434434
{
435435
$this->dispatcher->dispatch(
436436
new Test\BeforeTestMethodFinished(
@@ -447,7 +447,7 @@ public function testBeforeTestMethodFinished(string $testClassName, ClassMethod
447447
* @throws InvalidArgumentException
448448
* @throws UnknownEventTypeException
449449
*/
450-
public function testPreConditionCalled(string $testClassName, ClassMethod $calledMethod): void
450+
public function preConditionCalled(string $testClassName, ClassMethod $calledMethod): void
451451
{
452452
$this->dispatcher->dispatch(
453453
new Test\PreConditionCalled(
@@ -464,7 +464,7 @@ public function testPreConditionCalled(string $testClassName, ClassMethod $calle
464464
* @throws InvalidArgumentException
465465
* @throws UnknownEventTypeException
466466
*/
467-
public function testPreConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
467+
public function preConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
468468
{
469469
$this->dispatcher->dispatch(
470470
new Test\PreConditionErrored(
@@ -482,7 +482,7 @@ public function testPreConditionErrored(string $testClassName, ClassMethod $call
482482
* @throws InvalidArgumentException
483483
* @throws UnknownEventTypeException
484484
*/
485-
public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
485+
public function preConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
486486
{
487487
$this->dispatcher->dispatch(
488488
new Test\PreConditionFinished(
@@ -1035,7 +1035,7 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
10351035
* @throws InvalidArgumentException
10361036
* @throws UnknownEventTypeException
10371037
*/
1038-
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void
1038+
public function postConditionCalled(string $testClassName, ClassMethod $calledMethod): void
10391039
{
10401040
$this->dispatcher->dispatch(
10411041
new Test\PostConditionCalled(
@@ -1052,7 +1052,7 @@ public function testPostConditionCalled(string $testClassName, ClassMethod $call
10521052
* @throws InvalidArgumentException
10531053
* @throws UnknownEventTypeException
10541054
*/
1055-
public function testPostConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
1055+
public function postConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
10561056
{
10571057
$this->dispatcher->dispatch(
10581058
new Test\PostConditionErrored(
@@ -1070,7 +1070,7 @@ public function testPostConditionErrored(string $testClassName, ClassMethod $cal
10701070
* @throws InvalidArgumentException
10711071
* @throws UnknownEventTypeException
10721072
*/
1073-
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
1073+
public function postConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
10741074
{
10751075
$this->dispatcher->dispatch(
10761076
new Test\PostConditionFinished(
@@ -1087,7 +1087,7 @@ public function testPostConditionFinished(string $testClassName, ClassMethod ...
10871087
* @throws InvalidArgumentException
10881088
* @throws UnknownEventTypeException
10891089
*/
1090-
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
1090+
public function afterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
10911091
{
10921092
$this->dispatcher->dispatch(
10931093
new Test\AfterTestMethodCalled(
@@ -1104,7 +1104,7 @@ public function testAfterTestMethodCalled(string $testClassName, ClassMethod $ca
11041104
* @throws InvalidArgumentException
11051105
* @throws UnknownEventTypeException
11061106
*/
1107-
public function testAfterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
1107+
public function afterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
11081108
{
11091109
$this->dispatcher->dispatch(
11101110
new Test\AfterTestMethodErrored(
@@ -1122,7 +1122,7 @@ public function testAfterTestMethodErrored(string $testClassName, ClassMethod $c
11221122
* @throws InvalidArgumentException
11231123
* @throws UnknownEventTypeException
11241124
*/
1125-
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
1125+
public function afterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
11261126
{
11271127
$this->dispatcher->dispatch(
11281128
new Test\AfterTestMethodFinished(
@@ -1139,7 +1139,7 @@ public function testAfterTestMethodFinished(string $testClassName, ClassMethod .
11391139
* @throws InvalidArgumentException
11401140
* @throws UnknownEventTypeException
11411141
*/
1142-
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
1142+
public function afterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
11431143
{
11441144
$this->dispatcher->dispatch(
11451145
new Test\AfterLastTestMethodCalled(
@@ -1156,7 +1156,7 @@ public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod
11561156
* @throws InvalidArgumentException
11571157
* @throws UnknownEventTypeException
11581158
*/
1159-
public function testAfterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
1159+
public function afterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
11601160
{
11611161
$this->dispatcher->dispatch(
11621162
new Test\AfterLastTestMethodErrored(
@@ -1174,7 +1174,7 @@ public function testAfterLastTestMethodErrored(string $testClassName, ClassMetho
11741174
* @throws InvalidArgumentException
11751175
* @throws UnknownEventTypeException
11761176
*/
1177-
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
1177+
public function afterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
11781178
{
11791179
$this->dispatcher->dispatch(
11801180
new Test\AfterLastTestMethodFinished(

‎src/Event/Emitter/Emitter.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,47 +68,47 @@ public function testPreparationFailed(Code\Test $test): void;
6868
/**
6969
* @param class-string $testClassName
7070
*/
71-
public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
71+
public function beforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
7272

7373
/**
7474
* @param class-string $testClassName
7575
*/
76-
public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
76+
public function beforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
7777

7878
/**
7979
* @param class-string $testClassName
8080
*/
81-
public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
81+
public function beforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
8282

8383
/**
8484
* @param class-string $testClassName
8585
*/
86-
public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
86+
public function beforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
8787

8888
/**
8989
* @param class-string $testClassName
9090
*/
91-
public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
91+
public function beforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
9292

9393
/**
9494
* @param class-string $testClassName
9595
*/
96-
public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
96+
public function beforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
9797

9898
/**
9999
* @param class-string $testClassName
100100
*/
101-
public function testPreConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
101+
public function preConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
102102

103103
/**
104104
* @param class-string $testClassName
105105
*/
106-
public function testPreConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
106+
public function preConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
107107

108108
/**
109109
* @param class-string $testClassName
110110
*/
111-
public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
111+
public function preConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
112112

113113
public function testPrepared(Code\Test $test): void;
114114

@@ -259,47 +259,47 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
259259
/**
260260
* @param class-string $testClassName
261261
*/
262-
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
262+
public function postConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
263263

264264
/**
265265
* @param class-string $testClassName
266266
*/
267-
public function testPostConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
267+
public function postConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
268268

269269
/**
270270
* @param class-string $testClassName
271271
*/
272-
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
272+
public function postConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
273273

274274
/**
275275
* @param class-string $testClassName
276276
*/
277-
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
277+
public function afterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
278278

279279
/**
280280
* @param class-string $testClassName
281281
*/
282-
public function testAfterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
282+
public function afterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
283283

284284
/**
285285
* @param class-string $testClassName
286286
*/
287-
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
287+
public function afterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
288288

289289
/**
290290
* @param class-string $testClassName
291291
*/
292-
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
292+
public function afterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
293293

294294
/**
295295
* @param class-string $testClassName
296296
*/
297-
public function testAfterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
297+
public function afterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
298298

299299
/**
300300
* @param class-string $testClassName
301301
*/
302-
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
302+
public function afterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
303303

304304
public function testSuiteFinished(TestSuite $testSuite): void;
305305

‎src/Framework/TestCase.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,9 +2326,9 @@ private function invokeBeforeClassHookMethods(array $hookMethods, Event\Emitter
23262326
$this->invokeHookMethods(
23272327
$hookMethods['beforeClass'],
23282328
$emitter,
2329-
'testBeforeFirstTestMethodCalled',
2330-
'testBeforeFirstTestMethodErrored',
2331-
'testBeforeFirstTestMethodFinished',
2329+
'beforeFirstTestMethodCalled',
2330+
'beforeFirstTestMethodErrored',
2331+
'beforeFirstTestMethodFinished',
23322332
);
23332333
}
23342334

@@ -2342,9 +2342,9 @@ private function invokeBeforeTestHookMethods(array $hookMethods, Event\Emitter $
23422342
$this->invokeHookMethods(
23432343
$hookMethods['before'],
23442344
$emitter,
2345-
'testBeforeTestMethodCalled',
2346-
'testBeforeTestMethodErrored',
2347-
'testBeforeTestMethodFinished',
2345+
'beforeTestMethodCalled',
2346+
'beforeTestMethodErrored',
2347+
'beforeTestMethodFinished',
23482348
);
23492349
}
23502350

@@ -2358,9 +2358,9 @@ private function invokePreConditionHookMethods(array $hookMethods, Event\Emitter
23582358
$this->invokeHookMethods(
23592359
$hookMethods['preCondition'],
23602360
$emitter,
2361-
'testPreConditionCalled',
2362-
'testPreConditionErrored',
2363-
'testPreConditionFinished',
2361+
'preConditionCalled',
2362+
'preConditionErrored',
2363+
'preConditionFinished',
23642364
);
23652365
}
23662366

@@ -2374,9 +2374,9 @@ private function invokePostConditionHookMethods(array $hookMethods, Event\Emitte
23742374
$this->invokeHookMethods(
23752375
$hookMethods['postCondition'],
23762376
$emitter,
2377-
'testPostConditionCalled',
2378-
'testPostConditionErrored',
2379-
'testPostConditionFinished',
2377+
'postConditionCalled',
2378+
'postConditionErrored',
2379+
'postConditionFinished',
23802380
);
23812381
}
23822382

@@ -2390,9 +2390,9 @@ private function invokeAfterTestHookMethods(array $hookMethods, Event\Emitter $e
23902390
$this->invokeHookMethods(
23912391
$hookMethods['after'],
23922392
$emitter,
2393-
'testAfterTestMethodCalled',
2394-
'testAfterTestMethodErrored',
2395-
'testAfterTestMethodFinished',
2393+
'afterTestMethodCalled',
2394+
'afterTestMethodErrored',
2395+
'afterTestMethodFinished',
23962396
);
23972397
}
23982398

@@ -2408,16 +2408,16 @@ private function invokeAfterClassHookMethods(array $hookMethods, Event\Emitter $
24082408
$this->invokeHookMethods(
24092409
$hookMethods['afterClass'],
24102410
$emitter,
2411-
'testAfterLastTestMethodCalled',
2412-
'testAfterLastTestMethodErrored',
2413-
'testAfterLastTestMethodFinished',
2411+
'afterLastTestMethodCalled',
2412+
'afterLastTestMethodErrored',
2413+
'afterLastTestMethodFinished',
24142414
);
24152415
}
24162416

24172417
/**
2418-
* @param 'testAfterLastTestMethodCalled'|'testAfterTestMethodCalled'|'testBeforeFirstTestMethodCalled'|'testBeforeTestMethodCalled'|'testPostConditionCalled'|'testPreConditionCalled' $calledMethod
2419-
* @param 'testAfterLastTestMethodErrored'|'testAfterTestMethodErrored'|'testBeforeFirstTestMethodErrored'|'testBeforeTestMethodErrored'|'testPostConditionErrored'|'testPreConditionErrored' $erroredMethod
2420-
* @param 'testAfterLastTestMethodFinished'|'testAfterTestMethodFinished'|'testBeforeFirstTestMethodFinished'|'testBeforeTestMethodFinished'|'testPostConditionFinished'|'testPreConditionFinished' $finishedMethod
2418+
* @param 'afterLastTestMethodCalled'|'afterTestMethodCalled'|'beforeFirstTestMethodCalled'|'beforeTestMethodCalled'|'postConditionCalled'|'preConditionCalled' $calledMethod
2419+
* @param 'afterLastTestMethodErrored'|'afterTestMethodErrored'|'beforeFirstTestMethodErrored'|'beforeTestMethodErrored'|'postConditionErrored'|'preConditionErrored' $erroredMethod
2420+
* @param 'afterLastTestMethodFinished'|'afterTestMethodFinished'|'beforeFirstTestMethodFinished'|'beforeTestMethodFinished'|'postConditionFinished'|'preConditionFinished' $finishedMethod *
24212421
*
24222422
* @throws Throwable
24232423
*/

0 commit comments

Comments
 (0)