@@ -608,33 +608,32 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
608
608
return true ;
609
609
}
610
610
611
- $ methodsCalledBeforeFirstTest = [];
612
-
613
- $ beforeClassMethods = (new HookMethods )->hookMethods ($ this ->name )['beforeClass ' ];
611
+ $ methods = (new HookMethods )->hookMethods ($ this ->name )['beforeClass ' ];
612
+ $ calledMethods = [];
614
613
615
614
try {
616
- foreach ($ beforeClassMethods as $ beforeClassMethod ) {
617
- if ($ this ->methodDoesNotExistOrIsDeclaredInTestCase ($ beforeClassMethod )) {
615
+ foreach ($ methods as $ method ) {
616
+ if ($ this ->methodDoesNotExistOrIsDeclaredInTestCase ($ method )) {
618
617
continue ;
619
618
}
620
619
621
- if ($ missingRequirements = (new Requirements )->requirementsNotSatisfiedFor ($ this ->name , $ beforeClassMethod )) {
620
+ if ($ missingRequirements = (new Requirements )->requirementsNotSatisfiedFor ($ this ->name , $ method )) {
622
621
$ this ->markTestSuiteSkipped (implode (PHP_EOL , $ missingRequirements ));
623
622
}
624
623
625
- $ methodCalledBeforeFirstTest = new Event \Code \ClassMethod (
624
+ $ calledMethod = new Event \Code \ClassMethod (
626
625
$ this ->name ,
627
- $ beforeClassMethod ,
626
+ $ method ,
628
627
);
629
628
630
629
$ emitter ->testBeforeFirstTestMethodCalled (
631
630
$ this ->name ,
632
- $ methodCalledBeforeFirstTest ,
631
+ $ calledMethod ,
633
632
);
634
633
635
- $ methodsCalledBeforeFirstTest [] = $ methodCalledBeforeFirstTest ;
634
+ $ calledMethods [] = $ calledMethod ;
636
635
637
- call_user_func ([$ this ->name , $ beforeClassMethod ]);
636
+ call_user_func ([$ this ->name , $ method ]);
638
637
}
639
638
} catch (SkippedTest |SkippedTestSuiteError $ e ) {
640
639
$ emitter ->testSuiteSkipped (
@@ -644,28 +643,28 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
644
643
645
644
return false ;
646
645
} catch (Throwable $ t ) {
647
- assert (isset ($ methodCalledBeforeFirstTest ));
646
+ assert (isset ($ calledMethod ));
648
647
649
648
$ emitter ->testBeforeFirstTestMethodErrored (
650
649
$ this ->name ,
651
- $ methodCalledBeforeFirstTest ,
650
+ $ calledMethod ,
652
651
Event \Code \ThrowableBuilder::from ($ t ),
653
652
);
654
653
655
- if (!empty ($ methodsCalledBeforeFirstTest )) {
654
+ if (!empty ($ calledMethods )) {
656
655
$ emitter ->testBeforeFirstTestMethodFinished (
657
656
$ this ->name ,
658
- ...$ methodsCalledBeforeFirstTest ,
657
+ ...$ calledMethods ,
659
658
);
660
659
}
661
660
662
661
return false ;
663
662
}
664
663
665
- if (!empty ($ methodsCalledBeforeFirstTest )) {
664
+ if (!empty ($ calledMethods )) {
666
665
$ emitter ->testBeforeFirstTestMethodFinished (
667
666
$ this ->name ,
668
- ...$ methodsCalledBeforeFirstTest ,
667
+ ...$ calledMethods ,
669
668
);
670
669
}
671
670
@@ -678,45 +677,44 @@ private function invokeMethodsAfterLastTest(Event\Emitter $emitter): void
678
677
return ;
679
678
}
680
679
681
- $ methodsCalledAfterLastTest = [];
682
-
683
- $ afterClassMethods = (new HookMethods )->hookMethods ($ this ->name )['afterClass ' ];
680
+ $ methods = (new HookMethods )->hookMethods ($ this ->name )['afterClass ' ];
681
+ $ calledMethods = [];
684
682
685
- foreach ($ afterClassMethods as $ afterClassMethod ) {
686
- if ($ this ->methodDoesNotExistOrIsDeclaredInTestCase ($ afterClassMethod )) {
683
+ foreach ($ methods as $ method ) {
684
+ if ($ this ->methodDoesNotExistOrIsDeclaredInTestCase ($ method )) {
687
685
continue ;
688
686
}
689
687
690
- $ methodCalledAfterLastTest = new Event \Code \ClassMethod (
688
+ $ calledMethod = new Event \Code \ClassMethod (
691
689
$ this ->name ,
692
- $ afterClassMethod ,
690
+ $ method ,
693
691
);
694
692
695
693
try {
696
- call_user_func ([$ this ->name , $ afterClassMethod ]);
694
+ call_user_func ([$ this ->name , $ method ]);
697
695
} catch (Throwable $ t ) {
698
696
}
699
697
700
698
$ emitter ->testAfterLastTestMethodCalled (
701
699
$ this ->name ,
702
- $ methodCalledAfterLastTest ,
700
+ $ calledMethod ,
703
701
);
704
702
705
- $ methodsCalledAfterLastTest [] = $ methodCalledAfterLastTest ;
703
+ $ calledMethods [] = $ calledMethod ;
706
704
707
705
if (isset ($ t )) {
708
706
$ emitter ->testAfterLastTestMethodErrored (
709
707
$ this ->name ,
710
- $ methodCalledAfterLastTest ,
708
+ $ calledMethod ,
711
709
Event \Code \ThrowableBuilder::from ($ t ),
712
710
);
713
711
}
714
712
}
715
713
716
- if (!empty ($ methodsCalledAfterLastTest )) {
714
+ if (!empty ($ calledMethods )) {
717
715
$ emitter ->testAfterLastTestMethodFinished (
718
716
$ this ->name ,
719
- ...$ methodsCalledAfterLastTest ,
717
+ ...$ calledMethods ,
720
718
);
721
719
}
722
720
}
0 commit comments