fix phpstan & cs

src/TestProcessor.php

@@ -52,21 +52,21 @@ public function setup() : void {
 
 		$this->playerManager = new TestPlayerManager($this->pmmpUnit);
 		$this->playerBag = new PlayerBag();
-        try {
-            $this->runner->onLoad();
-        } catch (Throwable $e) {
-            TestResults::fatal($e);
-            $this->finish();
-        }
+		try {
+			$this->runner->onLoad();
+		} catch (Throwable $e) {
+			TestResults::fatal($e);
+			$this->finish();
+		}
 	}
 
 	public function prepare() : void {
-        try {
-            $this->runner->onEnable();
-        } catch (Throwable $e) {
-            TestResults::fatal($e);
-            $this->finish();
-        }
+		try {
+			$this->runner->onEnable();
+		} catch (Throwable $e) {
+			TestResults::fatal($e);
+			$this->finish();
+		}
 	}
 
 	public function start() : void {
@@ -81,14 +81,15 @@ public function start() : void {
 	}
 
 	public function stop() : void {
-        try {
-            $this->runner->onDisable();
-        } catch (Throwable $e) {
-            TestResults::fatal($e);
-
-            $this->finish(false);
-            return;
-        }
+		try {
+			$this->runner->onDisable();
+		} catch (Throwable $e) {
+			TestResults::fatal($e);
+
+			$this->finish(false);
+
+			return;
+		}
 		if (TestMemory::$currentTest !== null) {
 			global $lastExceptionError, $lastError;
 			$error = $lastExceptionError ?? $lastError;

src/framework/attribute/dataProvider/DataProviderAttribute.php → src/framework/attribute/DataProviderAttribute.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace ShockedPlot7560\PmmpUnit\framework\attribute\dataProvider;
+namespace ShockedPlot7560\PmmpUnit\framework\attribute;
 
 use Attribute;
 use ReflectionClass;
 use ReflectionMethod;
-use ShockedPlot7560\PmmpUnit\framework\attribute\MethodAttributeToRunner;
 use ShockedPlot7560\PmmpUnit\framework\runner\DataProviderRunner;
 use ShockedPlot7560\PmmpUnit\framework\runner\TestRunnerInterface;
 

src/framework/attribute/MethodAttributeToRunner.php

@@ -5,7 +5,11 @@
 use ReflectionClass;
 use ReflectionMethod;
 use ShockedPlot7560\PmmpUnit\framework\runner\TestRunnerInterface;
+use ShockedPlot7560\PmmpUnit\framework\TestCase;
 
 interface MethodAttributeToRunner {
+	/**
+	 * @param ReflectionClass<TestCase> $class
+	 */
 	public function getRunner(ReflectionClass $class, ReflectionMethod $method) : TestRunnerInterface;
 }

src/framework/result/FailedTest.php

@@ -3,21 +3,21 @@
 namespace ShockedPlot7560\PmmpUnit\framework\result;
 
 use ShockedPlot7560\PmmpUnit\framework\runner\TestRunnerInterface;
+use Stringable;
 use Throwable;
 
-class FailedTest implements TestResult, ThrowableResult, \Stringable {
+class FailedTest implements TestResult, ThrowableResult, Stringable {
 	public function __construct(
 		public readonly TestRunnerInterface $test,
 		public readonly Throwable $throwable
 	) {
 	}
 
-    public function getThrowable(): Throwable {
-        return $this->throwable;
-    }
+	public function getThrowable() : Throwable {
+		return $this->throwable;
+	}
 
-    public function __toString(): string
-    {
-        return $this->test->__toString();
-    }
+	public function __toString() : string {
+		return $this->test->__toString();
+	}
 }

src/framework/result/Fatal.php

@@ -2,17 +2,20 @@
 
 namespace ShockedPlot7560\PmmpUnit\framework\result;
 
-class Fatal implements TestResult, ThrowableResult, \Stringable {
-    public function __construct(
-        public readonly \Throwable $throwable
-    ) { }
+use Stringable;
+use Throwable;
 
-    public function getThrowable(): \Throwable {
-        return $this->throwable;
-    }
+class Fatal implements TestResult, ThrowableResult, Stringable {
+	public function __construct(
+		public readonly Throwable $throwable
+	) {
+	}
 
-    public function __toString(): string
-    {
-        return "Runtime exception";
-    }
-}
+	public function getThrowable() : Throwable {
+		return $this->throwable;
+	}
+
+	public function __toString() : string {
+		return "Runtime exception";
+	}
+}

src/framework/result/FatalTest.php

@@ -10,11 +10,10 @@ public function __construct(
 		public readonly TestRunnerInterface $test,
 		Throwable $throwable
 	) {
-        parent::__construct($throwable);
+		parent::__construct($throwable);
 	}
 
-    public function __toString(): string
-    {
-        return $this->test->__toString();
-    }
+	public function __toString() : string {
+		return $this->test->__toString();
+	}
 }

src/framework/result/TestResults.php

@@ -21,9 +21,9 @@ public static function fatalTest(TestRunnerInterface $test, Throwable $throwable
 		self::$testResults[] = new FatalTest($test, $throwable);
 	}
 
-    public static function fatal(Throwable $throwable) : void {
-        self::$testResults[] = new Fatal($throwable);
-    }
+	public static function fatal(Throwable $throwable) : void {
+		self::$testResults[] = new Fatal($throwable);
+	}
 
 	/**
 	 * @return TestResult[]

src/framework/result/ThrowableResult.php

@@ -2,6 +2,8 @@
 
 namespace ShockedPlot7560\PmmpUnit\framework\result;
 
+use Throwable;
+
 interface ThrowableResult {
-    public function getThrowable();
-}
+	public function getThrowable() : Throwable;
+}

src/framework/result/printer/TestResultPrinter.php

@@ -3,9 +3,8 @@
 namespace ShockedPlot7560\PmmpUnit\framework\result\printer;
 
 use Logger;
-use ShockedPlot7560\PmmpUnit\framework\result\FailedTest;
-use ShockedPlot7560\PmmpUnit\framework\result\FatalTest;
 use ShockedPlot7560\PmmpUnit\framework\result\ThrowableResult;
+use Stringable;
 
 class TestResultPrinter {
 	public function __construct(
@@ -60,7 +59,7 @@ private function printStats(Logger $logger) : void {
 		);
 	}
 
-	private function errorToString(ThrowableResult&\Stringable $error) : string {
+	private function errorToString(ThrowableResult&Stringable $error) : string {
 		$ret = $error->__toString() . ": ";
 		$ret .= str_replace("§", "&", $error->getThrowable()->getMessage());
 		$ret .= " (line: " . $error->getThrowable()->getLine() . ")";

src/framework/result/printer/TestResultsBag.php

@@ -4,12 +4,11 @@
 
 use ShockedPlot7560\PmmpUnit\framework\result\FailedTest;
 use ShockedPlot7560\PmmpUnit\framework\result\Fatal;
-use ShockedPlot7560\PmmpUnit\framework\result\FatalTest;
 use ShockedPlot7560\PmmpUnit\framework\result\SuccessTest;
 use ShockedPlot7560\PmmpUnit\framework\result\TestResult;
 
 class TestResultsBag {
-	/** @var FatalTest[] $fatalErrors */
+	/** @var Fatal[] $fatalErrors */
 	private array $fatalErrors = [];
 
 	/** @var FailedTest[] $failedTests */
@@ -57,7 +56,7 @@ public function getPassedTests() : array {
 	}
 
 	/**
-	 * @return FatalTest[]
+	 * @return Fatal[]
 	 */
 	public function getFatalErrors() : array {
 		return $this->fatalErrors;

src/framework/runner/DataProviderRunner.php

@@ -8,7 +8,7 @@
 use React\Promise\PromiseInterface;
 use ReflectionClass;
 use ReflectionMethod;
-use ShockedPlot7560\PmmpUnit\framework\attribute\dataProvider\DataProviderAttribute;
+use ShockedPlot7560\PmmpUnit\framework\attribute\DataProviderAttribute;
 use ShockedPlot7560\PmmpUnit\framework\TestCase;
 use Webmozart\Assert\Assert;
 

src/framework/runner/EndChildRunner.php

@@ -15,6 +15,9 @@
 abstract class EndChildRunner implements TestRunnerInterface {
 	private ?TestCase $instance = null;
 
+	/**
+	 * @param ReflectionClass<TestCase> $class
+	 */
 	public function __construct(
 		protected ReflectionClass $class,
 		protected ReflectionMethod $method
@@ -128,6 +131,9 @@ protected function getInstance(bool $regenerate = true) : TestCase {
 	}
 
 	private function createInstance() : TestCase {
-		return $this->class->newInstance(new ExpectedExceptionHandler($this->method));
+		/** @var TestCase $instance */
+		$instance = $this->class->newInstance(new ExpectedExceptionHandler($this->method));
+
+		return $instance;
 	}
 }