Fix

ondrejmirtes · ondrejmirtes · commit c8a27e213fa8 · 2020-05-02T17:44:25.000+02:00
diff --git a/src/Rules/Classes/MixinRule.php b/src/Rules/Classes/MixinRule.php
@@ -12,6 +12,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\VerbosityLevel;
 
@@ -21,6 +22,9 @@
 class MixinRule implements Rule
 {
 
+	/** @var FileTypeMapper */
+	private $fileTypeMapper;
+
 	/** @var ReflectionProvider */
 	private $reflectionProvider;
 
@@ -37,13 +41,15 @@ class MixinRule implements Rule
 	private $checkClassCaseSensitivity;
 
 	public function __construct(
+		FileTypeMapper $fileTypeMapper,
 		ReflectionProvider $reflectionProvider,
 		ClassCaseSensitivityCheck $classCaseSensitivityCheck,
 		GenericObjectTypeCheck $genericObjectTypeCheck,
 		MissingTypehintCheck $missingTypehintCheck,
 		bool $checkClassCaseSensitivity
 	)
 	{
+		$this->fileTypeMapper = $fileTypeMapper;
 		$this->reflectionProvider = $reflectionProvider;
 		$this->classCaseSensitivityCheck = $classCaseSensitivityCheck;
 		$this->genericObjectTypeCheck = $genericObjectTypeCheck;
@@ -64,11 +70,18 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$className = (string) $node->namespacedName;
-		if (!$this->reflectionProvider->hasClass($className)) {
+		$docComment = $node->getDocComment();
+		if ($docComment === null) {
 			return [];
 		}
-		$classReflection = $this->reflectionProvider->getClass($className);
-		$mixinTags = $classReflection->getMixinTags();
+		$resolvedPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
+			$scope->getFile(),
+			$className,
+			null,
+			null,
+			$docComment->getText()
+		);
+		$mixinTags = $resolvedPhpDoc->getMixinTags();
 		$errors = [];
 		foreach ($mixinTags as $mixinTag) {
 			$type = $mixinTag->getType();
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -69,9 +69,6 @@ public function testNestedFunctionCallsDoNotCauseExcessiveFunctionNesting(): voi
 
 	public function testExtendingUnknownClass(): void
 	{
-		if (PHP_VERSION_ID >= 70400) {
-			$this->markTestSkipped('Not supported on PHP 7.4 - results in fatal error.');
-		}
 		$errors = $this->runAnalyse(__DIR__ . '/data/extending-unknown-class.php');
 		$this->assertCount(1, $errors);
 		$this->assertNull($errors[0]->getLine());
diff --git a/tests/PHPStan/Rules/Classes/MixinRuleTest.php b/tests/PHPStan/Rules/Classes/MixinRuleTest.php
@@ -7,6 +7,7 @@
 use PHPStan\Rules\MissingTypehintCheck;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\FileTypeMapper;
 
 /**
  * @extends RuleTestCase<MixinRule>
@@ -19,6 +20,7 @@ protected function getRule(): Rule
 		$reflectionProvider = $this->createReflectionProvider();
 
 		return new MixinRule(
+			self::getContainer()->getByType(FileTypeMapper::class),
 			$reflectionProvider,
 			new ClassCaseSensitivityCheck($reflectionProvider),
 			new GenericObjectTypeCheck(),

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,6 @@ public function testNestedFunctionCallsDoNotCauseExcessiveFunctionNesting(): voi`
`69`	`69`
`70`	`70`	`public function testExtendingUnknownClass(): void`
`71`	`71`	`{`
`72`		`- if (PHP_VERSION_ID >= 70400) {`
`73`		`- $this->markTestSkipped('Not supported on PHP 7.4 - results in fatal error.');`
`74`		`- }`
`75`	`72`	`$errors = $this->runAnalyse(__DIR__ . '/data/extending-unknown-class.php');`
`76`	`73`	`$this->assertCount(1, $errors);`
`77`	`74`	`$this->assertNull($errors[0]->getLine());`