ThrowsPhpDocRule: rule should not change AST (fixed #113) (#114)

Author: pepakriz

src/Rules/ThrowsPhpDocRule.php

@@ -465,7 +465,11 @@ private function processFunction(Node\FunctionLike $node, Scope $scope): array
 			return [];
 		}
 
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $scope->getTraitReflection();
+		if ($classReflection === null) {
+			$classReflection = $scope->getClassReflection();
+		}
+
 		if ($classReflection === null) {
 			try {
 				$methodReflection = $this->broker->getFunction(new Name($node->name->toString()), $scope);
@@ -489,7 +493,7 @@ private function processFunction(Node\FunctionLike $node, Scope $scope): array
 		if (!$node->hasAttribute(self::ATTRIBUTE_HAS_CLASS_METHOD_END)) {
 			$node->setAttribute(self::ATTRIBUTE_HAS_CLASS_METHOD_END, true);
 			if ($node->stmts === null) {
-				$node->stmts = [];
+				throw new ShouldNotHappenException();
 			}
 			$node->stmts[] = new FunctionEnd($node);
 		}

tests/src/Rules/Bug113Test.php

@@ -0,0 +1,61 @@
+<?php declare(strict_types = 1);
+
+namespace Pepakriz\PHPStanExceptionRules\Rules;
+
+use Pepakriz\PHPStanExceptionRules\CheckedExceptionService;
+use Pepakriz\PHPStanExceptionRules\DefaultThrowTypeExtension;
+use Pepakriz\PHPStanExceptionRules\DefaultThrowTypeService;
+use Pepakriz\PHPStanExceptionRules\DynamicThrowTypeService;
+use Pepakriz\PHPStanExceptionRules\Rules\Data\CheckedException;
+use Pepakriz\PHPStanExceptionRules\Rules\DynamicExtension\DynamicExtension;
+use Pepakriz\PHPStanExceptionRules\RuleTestCase;
+use PHPStan\Rules\Rule;
+use ReflectionException;
+use RuntimeException;
+
+/**
+ * @extends RuleTestCase<ThrowsPhpDocRule>
+ */
+class Bug113Test extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		$defaultThrowTypeService = new DefaultThrowTypeService([], []);
+
+		$extensions = [
+			new DynamicExtension(),
+			new DefaultThrowTypeExtension($defaultThrowTypeService),
+		];
+
+		return new ThrowsPhpDocRule(
+			new CheckedExceptionService(
+				[
+					RuntimeException::class,
+					CheckedException::class,
+					ReflectionException::class,
+				]
+			),
+			new DynamicThrowTypeService(
+				$extensions,
+				$extensions,
+				$extensions,
+				$extensions
+			),
+			$defaultThrowTypeService,
+			$this->createThrowsAnnotationReader(),
+			$this->createBroker(),
+			false,
+			true,
+			false,
+			false,
+			[]
+		);
+	}
+
+	public function testBasicThrows(): void
+	{
+		$this->analyse(__DIR__ . '/data/bug113.php');
+	}
+
+}

tests/src/Rules/data/bug113.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types = 1);
+
+namespace Pepakriz\PHPStanExceptionRules\Rules\Bug113;
+
+trait FooTrait
+{
+
+	abstract public function getString(): string;
+
+}
+
+class Foo
+{
+
+	use FooTrait;
+
+	public function getString(): string
+	{
+		return 'Foo';
+	}
+
+}