Fix build (#121)

* Fixed compatibility with latest phpstan

* Require nikic/php-parser

* Fix RuleTestCase

Co-authored-by: Josef Kříž <[email protected]>

Author: VincentLanglet

composer.json

@@ -18,14 +18,15 @@
 	},
 	"require": {
 		"php": "^7.1",
-		"phpstan/phpstan": "^0.12.0"
+		"nikic/php-parser": "^4.4",
+		"phpstan/phpstan": "^0.12.18"
 	},
 	"require-dev": {
-		"jakub-onderka/php-console-highlighter": "0.4.0",
-		"jakub-onderka/php-parallel-lint": "1.0.0",
 		"nette/utils": "^3.0",
 		"php-coveralls/php-coveralls": "^2.1",
-		"phpstan/phpstan": "^0.12.0",
+		"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",
@@ -58,7 +59,7 @@
 		"check:tests": "phpunit --coverage-text",
 		"check:cs": "phpcs --extensions=php --encoding=utf-8 --tab-width=4 --colors --ignore=tests/*/data -sp src tests/src",
 		"check:lint": "parallel-lint src tests/src",
-		"check:types": "phpstan analyse -l max src tests",
+		"check:types": "phpstan analyse --memory-limit=1G -l max src tests",
 		"fix": "@fix:cs",
 		"fix:cs": "phpcbf --extensions=php --encoding=utf-8 --tab-width=4 --colors --ignore=tests/*/data -sp src tests/src",
 		"coveralls": "php-coveralls -v"

phpstan.neon.dist

@@ -14,10 +14,6 @@ parameters:
 
 	ignoreErrors:
 		- "#^Method Pepakriz\\\\PHPStanExceptionRules\\\\RuleTestCase\\:\\:getRule\\(\\) return type with generic interface PHPStan\\\\Rules\\\\Rule does not specify its types\\: TNodeType$#"
-		-
-			message: "#^Parameter \\#1 \\$rules of class PHPStan\\\\Rules\\\\Registry constructor expects array\\<PHPStan\\\\Rules\\\\Rule\\>, array\\<int, TRule of PHPStan\\\\Rules\\\\Rule\\> given\\.$#"
-			count: 1
-			path: tests/src/RuleTestCase.php
 
 	exceptionRules:
 		reportUnusedCatchesOfUncheckedExceptions: true

tests/src/RuleTestCase.php

@@ -8,12 +8,14 @@
 use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Analyser;
 use PHPStan\Analyser\Error;
+use PHPStan\Analyser\FileAnalyser;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Broker\AnonymousClassNameHelper;
 use PHPStan\Cache\Cache;
+use PHPStan\Dependency\DependencyResolver;
 use PHPStan\File\FileHelper;
-use PHPStan\File\FuzzyRelativePathHelper;
+use PHPStan\File\SimpleRelativePathHelper;
 use PHPStan\PhpDoc\PhpDocNodeResolver;
 use PHPStan\PhpDoc\PhpDocStringResolver;
 use PHPStan\PhpDoc\TypeNodeResolverExtension;
@@ -31,7 +33,6 @@
 use function implode;
 use function sprintf;
 use function trim;
-use const DIRECTORY_SEPARATOR;
 
 /**
  * @template TRule of \PHPStan\Rules\Rule
@@ -72,38 +73,50 @@ private function getAnalyser(): Analyser
 	{
 		if ($this->analyser === null) {
 			$registry = new Registry([$this->getRule()]);
-
 			$broker = $this->createBroker();
 			$printer = new Standard();
-			$fileHelper = $this->getFileHelper();
+
+			$currentWorkingDirectory = $this->getCurrentWorkingDirectory();
+			$fileHelper = new FileHelper($currentWorkingDirectory);
+			$relativePathHelper = new SimpleRelativePathHelper($currentWorkingDirectory);
+			$anonymousClassNameHelper = new AnonymousClassNameHelper($fileHelper, $relativePathHelper);
+
 			$typeSpecifier = $this->createTypeSpecifier(
 				$printer,
 				$broker,
 				$this->getMethodTypeSpecifyingExtensions(),
 				$this->getStaticMethodTypeSpecifyingExtensions()
 			);
-			$currentWorkingDirectory = $this->getCurrentWorkingDirectory();
-			$this->analyser = new Analyser(
-				$this->createScopeFactory($broker, $typeSpecifier),
+
+			$nodeScopeResolver = new NodeScopeResolver(
+				$broker,
 				$this->getParser(),
-				$registry,
-				new NodeScopeResolver(
-					$broker,
+				new FileTypeMapper(
 					$this->getParser(),
-					new FileTypeMapper($this->getParser(), self::getContainer()->getByType(PhpDocStringResolver::class), self::getContainer()->getByType(PhpDocNodeResolver::class), $this->createMock(Cache::class), new AnonymousClassNameHelper(new FileHelper($currentWorkingDirectory), new FuzzyRelativePathHelper($currentWorkingDirectory, DIRECTORY_SEPARATOR, []))),
-					$fileHelper,
-					$typeSpecifier,
-					$this->shouldPolluteScopeWithLoopInitialAssignments(),
-					$this->shouldPolluteCatchScopeWithTryAssignments(),
-					$this->shouldPolluteScopeWithAlwaysIterableForeach(),
-					[],
-					[]
+					self::getContainer()->getByType(PhpDocStringResolver::class),
+					self::getContainer()->getByType(PhpDocNodeResolver::class),
+					$this->createMock(Cache::class),
+					$anonymousClassNameHelper
 				),
 				$fileHelper,
+				$typeSpecifier,
+				$this->shouldPolluteScopeWithLoopInitialAssignments(),
+				$this->shouldPolluteCatchScopeWithTryAssignments(),
+				$this->shouldPolluteScopeWithAlwaysIterableForeach(),
 				[],
-				true,
-				50
+				[]
 			);
+
+			$fileAnalyser = new FileAnalyser(
+				$this->createScopeFactory($broker, $typeSpecifier),
+				$nodeScopeResolver,
+				$this->getParser(),
+				new DependencyResolver($broker),
+				$fileHelper,
+				$this->shouldReportUnmatchedIgnoredErrors()
+			);
+
+			$this->analyser = new Analyser($fileAnalyser, $registry, $nodeScopeResolver, 50);
 		}
 
 		return $this->analyser;
@@ -137,7 +150,7 @@ public function analyse(string $file): void
 	{
 		$file = $this->getFileHelper()->normalizePath($file);
 		$expectedErrors = $this->parseExpectedErrors($file);
-		$actualErrors = $this->getAnalyser()->analyse([$file], false);
+		$actualErrors = $this->getAnalyser()->analyse([$file])->getUnorderedErrors();
 
 		$strictlyTypedSprintf = static function (int $line, string $message): string {
 			return sprintf('%02d: %s', $line, $message);
@@ -210,4 +223,9 @@ protected function shouldPolluteScopeWithAlwaysIterableForeach(): bool
 		return false;
 	}
 
+	protected function shouldReportUnmatchedIgnoredErrors(): bool
+	{
+		return true;
+	}
+
 }