Skip to content

Commit 02b867a

Browse files
Rename variables
1 parent d2be391 commit 02b867a

File tree

1 file changed

+28
-30
lines changed

1 file changed

+28
-30
lines changed

src/Framework/TestSuite.php

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -608,33 +608,32 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
608608
return true;
609609
}
610610

611-
$methodsCalledBeforeFirstTest = [];
612-
613-
$beforeClassMethods = (new HookMethods)->hookMethods($this->name)['beforeClass'];
611+
$methods = (new HookMethods)->hookMethods($this->name)['beforeClass'];
612+
$calledMethods = [];
614613

615614
try {
616-
foreach ($beforeClassMethods as $beforeClassMethod) {
617-
if ($this->methodDoesNotExistOrIsDeclaredInTestCase($beforeClassMethod)) {
615+
foreach ($methods as $method) {
616+
if ($this->methodDoesNotExistOrIsDeclaredInTestCase($method)) {
618617
continue;
619618
}
620619

621-
if ($missingRequirements = (new Requirements)->requirementsNotSatisfiedFor($this->name, $beforeClassMethod)) {
620+
if ($missingRequirements = (new Requirements)->requirementsNotSatisfiedFor($this->name, $method)) {
622621
$this->markTestSuiteSkipped(implode(PHP_EOL, $missingRequirements));
623622
}
624623

625-
$methodCalledBeforeFirstTest = new Event\Code\ClassMethod(
624+
$calledMethod = new Event\Code\ClassMethod(
626625
$this->name,
627-
$beforeClassMethod,
626+
$method,
628627
);
629628

630629
$emitter->testBeforeFirstTestMethodCalled(
631630
$this->name,
632-
$methodCalledBeforeFirstTest,
631+
$calledMethod,
633632
);
634633

635-
$methodsCalledBeforeFirstTest[] = $methodCalledBeforeFirstTest;
634+
$calledMethods[] = $calledMethod;
636635

637-
call_user_func([$this->name, $beforeClassMethod]);
636+
call_user_func([$this->name, $method]);
638637
}
639638
} catch (SkippedTest|SkippedTestSuiteError $e) {
640639
$emitter->testSuiteSkipped(
@@ -644,28 +643,28 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
644643

645644
return false;
646645
} catch (Throwable $t) {
647-
assert(isset($methodCalledBeforeFirstTest));
646+
assert(isset($calledMethod));
648647

649648
$emitter->testBeforeFirstTestMethodErrored(
650649
$this->name,
651-
$methodCalledBeforeFirstTest,
650+
$calledMethod,
652651
Event\Code\ThrowableBuilder::from($t),
653652
);
654653

655-
if (!empty($methodsCalledBeforeFirstTest)) {
654+
if (!empty($calledMethods)) {
656655
$emitter->testBeforeFirstTestMethodFinished(
657656
$this->name,
658-
...$methodsCalledBeforeFirstTest,
657+
...$calledMethods,
659658
);
660659
}
661660

662661
return false;
663662
}
664663

665-
if (!empty($methodsCalledBeforeFirstTest)) {
664+
if (!empty($calledMethods)) {
666665
$emitter->testBeforeFirstTestMethodFinished(
667666
$this->name,
668-
...$methodsCalledBeforeFirstTest,
667+
...$calledMethods,
669668
);
670669
}
671670

@@ -678,45 +677,44 @@ private function invokeMethodsAfterLastTest(Event\Emitter $emitter): void
678677
return;
679678
}
680679

681-
$methodsCalledAfterLastTest = [];
682-
683-
$afterClassMethods = (new HookMethods)->hookMethods($this->name)['afterClass'];
680+
$methods = (new HookMethods)->hookMethods($this->name)['afterClass'];
681+
$calledMethods = [];
684682

685-
foreach ($afterClassMethods as $afterClassMethod) {
686-
if ($this->methodDoesNotExistOrIsDeclaredInTestCase($afterClassMethod)) {
683+
foreach ($methods as $method) {
684+
if ($this->methodDoesNotExistOrIsDeclaredInTestCase($method)) {
687685
continue;
688686
}
689687

690-
$methodCalledAfterLastTest = new Event\Code\ClassMethod(
688+
$calledMethod = new Event\Code\ClassMethod(
691689
$this->name,
692-
$afterClassMethod,
690+
$method,
693691
);
694692

695693
try {
696-
call_user_func([$this->name, $afterClassMethod]);
694+
call_user_func([$this->name, $method]);
697695
} catch (Throwable $t) {
698696
}
699697

700698
$emitter->testAfterLastTestMethodCalled(
701699
$this->name,
702-
$methodCalledAfterLastTest,
700+
$calledMethod,
703701
);
704702

705-
$methodsCalledAfterLastTest[] = $methodCalledAfterLastTest;
703+
$calledMethods[] = $calledMethod;
706704

707705
if (isset($t)) {
708706
$emitter->testAfterLastTestMethodErrored(
709707
$this->name,
710-
$methodCalledAfterLastTest,
708+
$calledMethod,
711709
Event\Code\ThrowableBuilder::from($t),
712710
);
713711
}
714712
}
715713

716-
if (!empty($methodsCalledAfterLastTest)) {
714+
if (!empty($calledMethods)) {
717715
$emitter->testAfterLastTestMethodFinished(
718716
$this->name,
719-
...$methodsCalledAfterLastTest,
717+
...$calledMethods,
720718
);
721719
}
722720
}

0 commit comments

Comments
 (0)