Scaffolding for auto-fixable errors (experimental)

Author: ondrejmirtes

composer.json

@@ -7,6 +7,7 @@
 	"require": {
 		"php": "^8.1",
 		"composer-runtime-api": "^2.0",
+		"bircher/php-merge": "^4.0",
 		"clue/ndjson-react": "^1.0",
 		"composer/ca-bundle": "^1.2",
 		"composer/semver": "^3.4",
@@ -37,6 +38,7 @@
 		"react/promise": "^3.2",
 		"react/socket": "^1.3",
 		"react/stream": "^1.1",
+		"sebastian/diff": "^4.0",
 		"symfony/console": "^5.4.3",
 		"symfony/finder": "^5.4.3",
 		"symfony/polyfill-intl-grapheme": "^1.23",

composer.lock

@@ -286,6 +286,11 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
+	-
+		class: PHPStan\Analyser\RuleErrorTransformer
+		arguments:
+			parser: @currentPhpVersionPhpParser
+
 	-
 		class: PHPStan\Analyser\Ignore\IgnoredErrorHelper
 		arguments:

conf/config.neon

@@ -60,6 +60,18 @@ parameters:
 			count: 1
 			path: src/Analyser/RicherScopeGetTypeHelper.php
 
+		-
+			message: '#^Call to method __construct\(\) of internal class PhpParser\\Internal\\TokenStream from outside its root namespace PhpParser\.$#'
+			identifier: method.internalClass
+			count: 1
+			path: src/Analyser/RuleErrorTransformer.php
+
+		-
+			message: '#^Instantiation of internal class PhpParser\\Internal\\TokenStream\.$#'
+			identifier: new.internalClass
+			count: 1
+			path: src/Analyser/RuleErrorTransformer.php
+
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ConstantScalarType is error\-prone and deprecated\. Use Type\:\:isConstantScalarValue\(\) or Type\:\:getConstantScalarTypes\(\) or Type\:\:getConstantScalarValues\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
@@ -102,6 +114,24 @@ parameters:
 			count: 1
 			path: src/Collectors/Registry.php
 
+		-
+			message: '#^Call to method getContent\(\) of internal class PhpMerge\\internal\\Line from outside its root namespace PhpMerge\.$#'
+			identifier: method.internalClass
+			count: 2
+			path: src/Command/AnalyseCommand.php
+
+		-
+			message: '#^Call to static method createArray\(\) of internal class PhpMerge\\internal\\Hunk from outside its root namespace PhpMerge\.$#'
+			identifier: staticMethod.internalClass
+			count: 2
+			path: src/Command/AnalyseCommand.php
+
+		-
+			message: '#^Call to static method createArray\(\) of internal class PhpMerge\\internal\\Line from outside its root namespace PhpMerge\.$#'
+			identifier: staticMethod.internalClass
+			count: 5
+			path: src/Command/AnalyseCommand.php
+
 		-
 			message: '#^Anonymous function has an unused use \$container\.$#'
 			identifier: closure.unusedUse
@@ -204,6 +234,24 @@ parameters:
 			count: 1
 			path: src/Diagnose/PHPStanDiagnoseExtension.php
 
+		-
+			message: '#^Call to method getTokenCode\(\) of internal class PhpParser\\Internal\\TokenStream from outside its root namespace PhpParser\.$#'
+			identifier: method.internalClass
+			count: 1
+			path: src/Fixable/PhpPrinterIndentationDetectorVisitor.php
+
+		-
+			message: '#^Parameter \$origTokens of method PHPStan\\Fixable\\PhpPrinterIndentationDetectorVisitor\:\:__construct\(\) has typehint with internal class PhpParser\\Internal\\TokenStream\.$#'
+			identifier: parameter.internalClass
+			count: 1
+			path: src/Fixable/PhpPrinterIndentationDetectorVisitor.php
+
+		-
+			message: '#^Property \$origTokens references internal class PhpParser\\Internal\\TokenStream in its type\.$#'
+			identifier: property.internalClass
+			count: 1
+			path: src/Fixable/PhpPrinterIndentationDetectorVisitor.php
+
 		-
 			message: '#^Access to property \$id of internal class Symfony\\Polyfill\\Php80\\PhpToken from outside its root namespace Symfony\.$#'
 			identifier: property.internalClass

phpstan-baseline.neon

@@ -89,7 +89,7 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles, bool $
 			}
 
 			foreach ($ruleErrors as $ruleError) {
-				$error = $this->ruleErrorTransformer->transform($ruleError, $scope, $nodeType, $node->getStartLine());
+				$error = $this->ruleErrorTransformer->transform($ruleError, $scope, [], $node);
 
 				if ($error->canBeIgnored()) {
 					foreach ($this->ignoreErrorExtensionProvider->getExtensions() as $ignoreErrorExtension) {