Refactor

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -608,57 +608,61 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
             return true;
         }
 
-        $methods       = (new HookMethods)->hookMethods($this->name)['beforeClass'];
-        $calledMethods = [];
+        $methods         = (new HookMethods)->hookMethods($this->name)['beforeClass'];
+        $calledMethods   = [];
+        $emitCalledEvent = true;
+        $result          = true;
 
-        try {
-            foreach ($methods as $method) {
-                if ($this->methodDoesNotExistOrIsDeclaredInTestCase($method)) {
-                    continue;
-                }
+        foreach ($methods as $method) {
+            if ($this->methodDoesNotExistOrIsDeclaredInTestCase($method)) {
+                continue;
+            }
+
+            $calledMethod = new Event\Code\ClassMethod(
+                $this->name,
+                $method,
+            );
+
+            try {
+                $missingRequirements = (new Requirements)->requirementsNotSatisfiedFor($this->name, $method);
+
+                if ($missingRequirements !== []) {
+                    $emitCalledEvent = false;
 
-                if ($missingRequirements = (new Requirements)->requirementsNotSatisfiedFor($this->name, $method)) {
                     $this->markTestSuiteSkipped(implode(PHP_EOL, $missingRequirements));
                 }
 
-                $calledMethod = new Event\Code\ClassMethod(
-                    $this->name,
-                    $method,
-                );
+                call_user_func([$this->name, $method]);
+            } catch (Throwable $t) {
+            }
 
+            if ($emitCalledEvent) {
                 $emitter->testBeforeFirstTestMethodCalled(
                     $this->name,
                     $calledMethod,
                 );
 
                 $calledMethods[] = $calledMethod;
-
-                call_user_func([$this->name, $method]);
             }
-        } catch (SkippedTest|SkippedTestSuiteError $e) {
-            $emitter->testSuiteSkipped(
-                $testSuiteValueObjectForEvents,
-                $e->getMessage(),
-            );
 
-            return false;
-        } catch (Throwable $t) {
-            assert(isset($calledMethod));
+            if (isset($t) && $t instanceof SkippedTest) {
+                $emitter->testSuiteSkipped(
+                    $testSuiteValueObjectForEvents,
+                    $t->getMessage(),
+                );
 
-            $emitter->testBeforeFirstTestMethodErrored(
-                $this->name,
-                $calledMethod,
-                Event\Code\ThrowableBuilder::from($t),
-            );
+                return false;
+            }
 
-            if (!empty($calledMethods)) {
-                $emitter->testBeforeFirstTestMethodFinished(
+            if (isset($t)) {
+                $emitter->testBeforeFirstTestMethodErrored(
                     $this->name,
-                    ...$calledMethods,
+                    $calledMethod,
+                    Event\Code\ThrowableBuilder::from($t),
                 );
-            }
 
-            return false;
+                $result = false;
+            }
         }
 
         if (!empty($calledMethods)) {
@@ -668,7 +672,7 @@ private function invokeMethodsBeforeFirstTest(Event\Emitter $emitter, Event\Test
             );
         }
 
-        return true;
+        return $result;
     }
 
     private function invokeMethodsAfterLastTest(Event\Emitter $emitter): void