Skip to content

Commit 7b435b3

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.0
2 parents 963b54c + fe53177 commit 7b435b3

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
@@ -342,7 +342,7 @@ public function testPreparationFailed(Code\Test $test): void
342342
* @throws InvalidArgumentException
343343
* @throws UnknownEventTypeException
344344
*/
345-
public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
345+
public function beforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
346346
{
347347
$this->dispatcher->dispatch(
348348
new Test\BeforeFirstTestMethodCalled(
@@ -359,7 +359,7 @@ public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMeth
359359
* @throws InvalidArgumentException
360360
* @throws UnknownEventTypeException
361361
*/
362-
public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
362+
public function beforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
363363
{
364364
$this->dispatcher->dispatch(
365365
new Test\BeforeFirstTestMethodErrored(
@@ -377,7 +377,7 @@ public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMet
377377
* @throws InvalidArgumentException
378378
* @throws UnknownEventTypeException
379379
*/
380-
public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
380+
public function beforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
381381
{
382382
$this->dispatcher->dispatch(
383383
new Test\BeforeFirstTestMethodFinished(
@@ -394,7 +394,7 @@ public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMe
394394
* @throws InvalidArgumentException
395395
* @throws UnknownEventTypeException
396396
*/
397-
public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
397+
public function beforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
398398
{
399399
$this->dispatcher->dispatch(
400400
new Test\BeforeTestMethodCalled(
@@ -411,7 +411,7 @@ public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $c
411411
* @throws InvalidArgumentException
412412
* @throws UnknownEventTypeException
413413
*/
414-
public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
414+
public function beforeTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
415415
{
416416
$this->dispatcher->dispatch(
417417
new Test\BeforeTestMethodErrored(
@@ -429,7 +429,7 @@ public function testBeforeTestMethodErrored(string $testClassName, ClassMethod $
429429
* @throws InvalidArgumentException
430430
* @throws UnknownEventTypeException
431431
*/
432-
public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
432+
public function beforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
433433
{
434434
$this->dispatcher->dispatch(
435435
new Test\BeforeTestMethodFinished(
@@ -446,7 +446,7 @@ public function testBeforeTestMethodFinished(string $testClassName, ClassMethod
446446
* @throws InvalidArgumentException
447447
* @throws UnknownEventTypeException
448448
*/
449-
public function testPreConditionCalled(string $testClassName, ClassMethod $calledMethod): void
449+
public function preConditionCalled(string $testClassName, ClassMethod $calledMethod): void
450450
{
451451
$this->dispatcher->dispatch(
452452
new Test\PreConditionCalled(
@@ -463,7 +463,7 @@ public function testPreConditionCalled(string $testClassName, ClassMethod $calle
463463
* @throws InvalidArgumentException
464464
* @throws UnknownEventTypeException
465465
*/
466-
public function testPreConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
466+
public function preConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
467467
{
468468
$this->dispatcher->dispatch(
469469
new Test\PreConditionErrored(
@@ -481,7 +481,7 @@ public function testPreConditionErrored(string $testClassName, ClassMethod $call
481481
* @throws InvalidArgumentException
482482
* @throws UnknownEventTypeException
483483
*/
484-
public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
484+
public function preConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
485485
{
486486
$this->dispatcher->dispatch(
487487
new Test\PreConditionFinished(
@@ -960,7 +960,7 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
960960
* @throws InvalidArgumentException
961961
* @throws UnknownEventTypeException
962962
*/
963-
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void
963+
public function postConditionCalled(string $testClassName, ClassMethod $calledMethod): void
964964
{
965965
$this->dispatcher->dispatch(
966966
new Test\PostConditionCalled(
@@ -977,7 +977,7 @@ public function testPostConditionCalled(string $testClassName, ClassMethod $call
977977
* @throws InvalidArgumentException
978978
* @throws UnknownEventTypeException
979979
*/
980-
public function testPostConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
980+
public function postConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
981981
{
982982
$this->dispatcher->dispatch(
983983
new Test\PostConditionErrored(
@@ -995,7 +995,7 @@ public function testPostConditionErrored(string $testClassName, ClassMethod $cal
995995
* @throws InvalidArgumentException
996996
* @throws UnknownEventTypeException
997997
*/
998-
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
998+
public function postConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
999999
{
10001000
$this->dispatcher->dispatch(
10011001
new Test\PostConditionFinished(
@@ -1012,7 +1012,7 @@ public function testPostConditionFinished(string $testClassName, ClassMethod ...
10121012
* @throws InvalidArgumentException
10131013
* @throws UnknownEventTypeException
10141014
*/
1015-
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
1015+
public function afterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
10161016
{
10171017
$this->dispatcher->dispatch(
10181018
new Test\AfterTestMethodCalled(
@@ -1029,7 +1029,7 @@ public function testAfterTestMethodCalled(string $testClassName, ClassMethod $ca
10291029
* @throws InvalidArgumentException
10301030
* @throws UnknownEventTypeException
10311031
*/
1032-
public function testAfterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
1032+
public function afterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
10331033
{
10341034
$this->dispatcher->dispatch(
10351035
new Test\AfterTestMethodErrored(
@@ -1047,7 +1047,7 @@ public function testAfterTestMethodErrored(string $testClassName, ClassMethod $c
10471047
* @throws InvalidArgumentException
10481048
* @throws UnknownEventTypeException
10491049
*/
1050-
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
1050+
public function afterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
10511051
{
10521052
$this->dispatcher->dispatch(
10531053
new Test\AfterTestMethodFinished(
@@ -1064,7 +1064,7 @@ public function testAfterTestMethodFinished(string $testClassName, ClassMethod .
10641064
* @throws InvalidArgumentException
10651065
* @throws UnknownEventTypeException
10661066
*/
1067-
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
1067+
public function afterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
10681068
{
10691069
$this->dispatcher->dispatch(
10701070
new Test\AfterLastTestMethodCalled(
@@ -1081,7 +1081,7 @@ public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod
10811081
* @throws InvalidArgumentException
10821082
* @throws UnknownEventTypeException
10831083
*/
1084-
public function testAfterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
1084+
public function afterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
10851085
{
10861086
$this->dispatcher->dispatch(
10871087
new Test\AfterLastTestMethodErrored(
@@ -1099,7 +1099,7 @@ public function testAfterLastTestMethodErrored(string $testClassName, ClassMetho
10991099
* @throws InvalidArgumentException
11001100
* @throws UnknownEventTypeException
11011101
*/
1102-
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
1102+
public function afterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
11031103
{
11041104
$this->dispatcher->dispatch(
11051105
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

@@ -232,47 +232,47 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
232232
/**
233233
* @param class-string $testClassName
234234
*/
235-
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
235+
public function postConditionCalled(string $testClassName, ClassMethod $calledMethod): void;
236236

237237
/**
238238
* @param class-string $testClassName
239239
*/
240-
public function testPostConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
240+
public function postConditionErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
241241

242242
/**
243243
* @param class-string $testClassName
244244
*/
245-
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
245+
public function postConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;
246246

247247
/**
248248
* @param class-string $testClassName
249249
*/
250-
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
250+
public function afterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
251251

252252
/**
253253
* @param class-string $testClassName
254254
*/
255-
public function testAfterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
255+
public function afterTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
256256

257257
/**
258258
* @param class-string $testClassName
259259
*/
260-
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
260+
public function afterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
261261

262262
/**
263263
* @param class-string $testClassName
264264
*/
265-
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
265+
public function afterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;
266266

267267
/**
268268
* @param class-string $testClassName
269269
*/
270-
public function testAfterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
270+
public function afterLastTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;
271271

272272
/**
273273
* @param class-string $testClassName
274274
*/
275-
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
275+
public function afterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;
276276

277277
public function testSuiteFinished(TestSuite $testSuite): void;
278278

‎src/Framework/TestCase.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,9 +1887,9 @@ private function invokeBeforeClassHookMethods(array $hookMethods, Event\Emitter
18871887
$this->invokeHookMethods(
18881888
$hookMethods['beforeClass'],
18891889
$emitter,
1890-
'testBeforeFirstTestMethodCalled',
1891-
'testBeforeFirstTestMethodErrored',
1892-
'testBeforeFirstTestMethodFinished',
1890+
'beforeFirstTestMethodCalled',
1891+
'beforeFirstTestMethodErrored',
1892+
'beforeFirstTestMethodFinished',
18931893
);
18941894
}
18951895

@@ -1903,9 +1903,9 @@ private function invokeBeforeTestHookMethods(array $hookMethods, Event\Emitter $
19031903
$this->invokeHookMethods(
19041904
$hookMethods['before'],
19051905
$emitter,
1906-
'testBeforeTestMethodCalled',
1907-
'testBeforeTestMethodErrored',
1908-
'testBeforeTestMethodFinished',
1906+
'beforeTestMethodCalled',
1907+
'beforeTestMethodErrored',
1908+
'beforeTestMethodFinished',
19091909
);
19101910
}
19111911

@@ -1919,9 +1919,9 @@ private function invokePreConditionHookMethods(array $hookMethods, Event\Emitter
19191919
$this->invokeHookMethods(
19201920
$hookMethods['preCondition'],
19211921
$emitter,
1922-
'testPreConditionCalled',
1923-
'testPreConditionErrored',
1924-
'testPreConditionFinished',
1922+
'preConditionCalled',
1923+
'preConditionErrored',
1924+
'preConditionFinished',
19251925
);
19261926
}
19271927

@@ -1935,9 +1935,9 @@ private function invokePostConditionHookMethods(array $hookMethods, Event\Emitte
19351935
$this->invokeHookMethods(
19361936
$hookMethods['postCondition'],
19371937
$emitter,
1938-
'testPostConditionCalled',
1939-
'testPostConditionErrored',
1940-
'testPostConditionFinished',
1938+
'postConditionCalled',
1939+
'postConditionErrored',
1940+
'postConditionFinished',
19411941
);
19421942
}
19431943

@@ -1951,9 +1951,9 @@ private function invokeAfterTestHookMethods(array $hookMethods, Event\Emitter $e
19511951
$this->invokeHookMethods(
19521952
$hookMethods['after'],
19531953
$emitter,
1954-
'testAfterTestMethodCalled',
1955-
'testAfterTestMethodErrored',
1956-
'testAfterTestMethodFinished',
1954+
'afterTestMethodCalled',
1955+
'afterTestMethodErrored',
1956+
'afterTestMethodFinished',
19571957
);
19581958
}
19591959

@@ -1969,16 +1969,16 @@ private function invokeAfterClassHookMethods(array $hookMethods, Event\Emitter $
19691969
$this->invokeHookMethods(
19701970
$hookMethods['afterClass'],
19711971
$emitter,
1972-
'testAfterLastTestMethodCalled',
1973-
'testAfterLastTestMethodErrored',
1974-
'testAfterLastTestMethodFinished',
1972+
'afterLastTestMethodCalled',
1973+
'afterLastTestMethodErrored',
1974+
'afterLastTestMethodFinished',
19751975
);
19761976
}
19771977

19781978
/**
1979-
* @param 'testAfterLastTestMethodCalled'|'testAfterTestMethodCalled'|'testBeforeFirstTestMethodCalled'|'testBeforeTestMethodCalled'|'testPostConditionCalled'|'testPreConditionCalled' $calledMethod
1980-
* @param 'testAfterLastTestMethodErrored'|'testAfterTestMethodErrored'|'testBeforeFirstTestMethodErrored'|'testBeforeTestMethodErrored'|'testPostConditionErrored'|'testPreConditionErrored' $erroredMethod
1981-
* @param 'testAfterLastTestMethodFinished'|'testAfterTestMethodFinished'|'testBeforeFirstTestMethodFinished'|'testBeforeTestMethodFinished'|'testPostConditionFinished'|'testPreConditionFinished' $finishedMethod
1979+
* @param 'afterLastTestMethodCalled'|'afterTestMethodCalled'|'beforeFirstTestMethodCalled'|'beforeTestMethodCalled'|'postConditionCalled'|'preConditionCalled' $calledMethod
1980+
* @param 'afterLastTestMethodErrored'|'afterTestMethodErrored'|'beforeFirstTestMethodErrored'|'beforeTestMethodErrored'|'postConditionErrored'|'preConditionErrored' $erroredMethod
1981+
* @param 'afterLastTestMethodFinished'|'afterTestMethodFinished'|'beforeFirstTestMethodFinished'|'beforeTestMethodFinished'|'postConditionFinished'|'preConditionFinished' $finishedMethod *
19821982
*
19831983
* @throws Throwable
19841984
*/

0 commit comments

Comments
 (0)