Add compatibility with phpstan 0.12.25 (#122)

Author: VincentLanglet

composer.json

@@ -19,14 +19,13 @@
 	"require": {
 		"php": "^7.1",
 		"nikic/php-parser": "^4.4",
-		"phpstan/phpstan": "^0.12.18"
+		"phpstan/phpstan": "^0.12.25"
 	},
 	"require-dev": {
 		"nette/utils": "^3.0",
 		"php-coveralls/php-coveralls": "^2.1",
 		"php-parallel-lint/php-console-highlighter": "^0.4.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2.0",
-		"phpstan/phpstan": "^0.12.18",
 		"phpstan/phpstan-nette": "^0.12.0",
 		"phpstan/phpstan-phpunit": "^0.12.0",
 		"phpstan/phpstan-strict-rules": "^0.12.0",

phpstan.neon.dist

@@ -12,9 +12,6 @@ parameters:
 	excludes_analyse:
 		- %rootDir%/../../../tests/*/data/*
 
-	ignoreErrors:
-		- "#^Method Pepakriz\\\\PHPStanExceptionRules\\\\RuleTestCase\\:\\:getRule\\(\\) return type with generic interface PHPStan\\\\Rules\\\\Rule does not specify its types\\: TNodeType$#"
-
 	exceptionRules:
 		reportUnusedCatchesOfUncheckedExceptions: true
 		uncheckedExceptions:

src/Rules/DeadCatchUnionRule.php

@@ -37,9 +37,8 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node instanceof Catch_) {
-			return [];
-		}
+		/** @var Catch_ $node */
+		$node = $node;
 
 		if (count($node->types) <= 1) {
 			return [];

src/Rules/ThrowsPhpDocInheritanceRule.php

@@ -75,9 +75,8 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node instanceof ClassMethod) {
-			return [];
-		}
+		/** @var ClassMethod $node */
+		$node = $node;
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {

tests/src/RuleTestCase.php

@@ -16,6 +16,7 @@
 use PHPStan\Dependency\DependencyResolver;
 use PHPStan\File\FileHelper;
 use PHPStan\File\SimpleRelativePathHelper;
+use PHPStan\PhpDoc\PhpDocInheritanceResolver;
 use PHPStan\PhpDoc\PhpDocNodeResolver;
 use PHPStan\PhpDoc\PhpDocStringResolver;
 use PHPStan\PhpDoc\TypeNodeResolverExtension;
@@ -88,16 +89,20 @@ private function getAnalyser(): Analyser
 				$this->getStaticMethodTypeSpecifyingExtensions()
 			);
 
+			$fileTypeMapper = new FileTypeMapper(
+				$this->getParser(),
+				self::getContainer()->getByType(PhpDocStringResolver::class),
+				self::getContainer()->getByType(PhpDocNodeResolver::class),
+				$this->createMock(Cache::class),
+				$anonymousClassNameHelper
+			);
+			$phpDocInheritanceResolver = new PhpDocInheritanceResolver($fileTypeMapper);
+
 			$nodeScopeResolver = new NodeScopeResolver(
 				$broker,
 				$this->getParser(),
-				new FileTypeMapper(
-					$this->getParser(),
-					self::getContainer()->getByType(PhpDocStringResolver::class),
-					self::getContainer()->getByType(PhpDocNodeResolver::class),
-					$this->createMock(Cache::class),
-					$anonymousClassNameHelper
-				),
+				$fileTypeMapper,
+				$phpDocInheritanceResolver,
 				$fileHelper,
 				$typeSpecifier,
 				$this->shouldPolluteScopeWithLoopInitialAssignments(),