Make --fix fast and complete: linear patching, multi-node fixes, fix rounds

.github/workflows/e2e-tests.yml

@@ -967,6 +967,32 @@ jobs:
               OUTPUT=$(../bashunit assert exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")
               echo "$OUTPUT"
               ../bashunit assert contains 'FooTrait.php (in context of class ResultCacheE2ETraitAlongsideClass\ClassUsingFooTrait):10:Method ResultCacheE2ETraitAlongsideClass\ClassUsingFooTrait::doFooTrait() should return stdClass but returns Exception. [identifier=return.type]' "$OUTPUT"
+          - script: |
+              cd e2e/fix
+              composer install
+              rm -rf src cycle tmp && cp -r original src && cp -r cycle-original cycle
+              OUTPUT=$(AI_AGENT=1 ../bashunit assert exit_code "1" "../../bin/phpstan analyse --error-format raw")
+              echo "$OUTPUT"
+              ../bashunit assert contains '7 of the errors can be fixed automatically. Run PHPStan again with --fix' "$OUTPUT"
+              OUTPUT=$(../bashunit assert exit_code "0" "../../bin/phpstan analyse --fix")
+              echo "$OUTPUT"
+              ../bashunit assert contains 'Analysing fixed code (round 4)...' "$OUTPUT"
+              ../bashunit assert not_contains 'round 5' "$OUTPUT"
+              ../bashunit assert contains 'Round 2: fixed 3 errors in 1 file' "$OUTPUT"
+              ../bashunit assert contains '[OK] 10 errors fixed in 2 files' "$OUTPUT"
+              diff -u expected/Foo.php src/Foo.php
+              diff -u expected/Ignored-fix.php src/Ignored.php
+              OUTPUT=$(../bashunit assert exit_code "0" "../../bin/phpstan analyse --fix-ignored")
+              echo "$OUTPUT"
+              ../bashunit assert contains '[OK] 2 errors fixed' "$OUTPUT"
+              diff -u expected/Foo.php src/Foo.php
+              diff -u expected/Ignored-fix-ignored.php src/Ignored.php
+              OUTPUT=$(../bashunit assert exit_code "1" "../../bin/phpstan analyse --fix --fix-ignored")
+              echo "$OUTPUT"
+              ../bashunit assert contains 'No fixable errors found' "$OUTPUT"
+              OUTPUT=$(../bashunit assert exit_code "1" "../../bin/phpstan analyse -c cycle.neon --fix")
+              echo "$OUTPUT"
+              ../bashunit assert contains 'Fixing stopped after 10 rounds' "$OUTPUT"
           - script: |
               cd e2e/editor-mode
               OUTPUT=$(../bashunit assert exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")

.github/workflows/issue-bot.yml

@@ -1,6 +1,6 @@
 # https://help.github.com/en/categories/automating-your-workflow-with-github-actions
 
 name: "Issue bot"
 
 on:
   workflow_dispatch:
@@ -54,9 +54,9 @@
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ./issue-bot/tmp
-          key: "issue-bot-download-v8-${{ github.run_id }}"
+          key: "issue-bot-download-v9-${{ github.run_id }}"
           restore-keys: |
-            issue-bot-download-v8-
+            issue-bot-download-v9-
 
       - name: "Download data"
         working-directory: "issue-bot"

.github/workflows/phar.yml

@@ -70,8 +70,12 @@ jobs:
           ignore-cache: true
 
       # only sebastian/diff ^4 supports PHP 7.4 so we need that in the PHAR
+      # it stays in require, the PHAR is built without dev dependencies and the fixer needs it
       - name: "Downgrade PHPUnit"
-        run: "composer require --dev phpunit/phpunit:^9.6 sebastian/diff:^4.0 doctrine/instantiator:^1.0 --update-with-dependencies --ignore-platform-reqs"
+        run: |
+          composer require --no-update sebastian/diff:^4.0
+          composer require --dev --no-update phpunit/phpunit:^9.6 doctrine/instantiator:^1.0
+          composer update phpunit/phpunit sebastian/diff doctrine/instantiator --with-all-dependencies --ignore-platform-reqs
 
       - name: "Install compiler dependencies"
         uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # v4.0.0

build/baseline-pre-8.0.neon

@@ -157,3 +157,27 @@ parameters:
 			identifier: property.internalClass
 			count: 3
 			path: ../src/Parser/RichParser.php
+
+		-
+			rawMessage: Access to property $id of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 6
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $line of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 7
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $pos of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 1
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $text of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 2
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php

build/composer-dependency-analyser.php

@@ -17,7 +17,6 @@
 ];
 
 $pinnedToSupportPhp72 = [
-	'symfony/process',
 	'symfony/service-contracts',
 	'symfony/string',
 ];

build/ignore-gte-php7.4-errors.neon

@@ -3,7 +3,7 @@ includes:
 
 parameters:
 	ignoreErrors:
-		- '#^Class PHPStan\\Rules\\RuleErrors\\RuleError(?:\d+) has an uninitialized property (?:\$message|\$line|\$identifier|\$tip|\$file|\$metadata|\$originalNode)#'
+		- '#^Class PHPStan\\Rules\\RuleErrors\\RuleError(?:\d+) has an uninitialized property (?:\$message|\$line|\$identifier|\$tip|\$file|\$metadata|\$nodeFixes)#'
 		- '#Extension has an uninitialized property (?:\$typeSpecifier|\$broker)#'
 		-
 			message: '#has an uninitialized property#'

build/php-85.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			rawMessage: 'Call to deprecated method setAccessible() of class ReflectionMethod.'
-			identifier: method.deprecated
-			count: 1
-			path: ../src/Fixable/Patcher.php
-
 		-
 			rawMessage: 'Call to deprecated method setAccessible() of class ReflectionProperty.'
 			identifier: method.deprecated

composer.json

@@ -33,7 +33,6 @@
 		"ondram/ci-detector": "^4.0",
 		"ondrejmirtes/better-reflection": "6.75.0.4",
 		"ondrejmirtes/composer-attribute-collector": "^1.2.0",
-		"ondrejmirtes/php-merge": "^4.1",
 		"ondrejmirtes/phplrt-runtime": "4.2.4.1",
 		"phpstan/php-8-stubs": "0.4.43",
 		"phpstan/phpdoc-parser": "2.4.1",

e2e/fix/.gitignore

@@ -0,0 +1,5 @@
+/src
+/cycle
+/tmp
+/vendor
+/composer.lock

e2e/fix/composer.json

@@ -0,0 +1,7 @@
+{
+	"autoload-dev": {
+		"classmap": [
+			"rules/"
+		]
+	}
+}

e2e/fix/cycle-original/Foo.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace FixE2E;
+
+function ping(): void {}
+function pong(): void {}
+
+ping();

e2e/fix/cycle.neon

@@ -0,0 +1,8 @@
+parameters:
+	level: 0
+	paths:
+		- cycle
+	tmpDir: tmp
+
+rules:
+	- FixE2E\PingPongRule

e2e/fix/expected/Foo.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace FixE2E;
+
+function step1(): void {}
+function step2(): void {}
+function step3(): void {}
+function step4(): void {}
+function noArgs(int ...$args): void {}
+
+step4();
+step4();
+step4();
+step4();
+noArgs();

e2e/fix/expected/Ignored-fix-ignored.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace FixE2E;
+
+step4();
+noArgs();

e2e/fix/expected/Ignored-fix.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace FixE2E;
+
+step2();
+noArgs();

e2e/fix/original/Foo.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace FixE2E;
+
+function step1(): void {}
+function step2(): void {}
+function step3(): void {}
+function step4(): void {}
+function noArgs(int ...$args): void {}
+
+step1();
+step2();
+step3();
+step4();
+noArgs(1, 2, 3);

e2e/fix/original/Ignored.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace FixE2E;
+
+step2();
+noArgs(1);

e2e/fix/phpstan.neon

@@ -0,0 +1,13 @@
+parameters:
+	level: 0
+	paths:
+		- src
+	tmpDir: tmp
+	ignoreErrors:
+		-
+			identifier: fixE2E.step
+			path: src/Ignored.php
+
+rules:
+	- FixE2E\StepRule
+	- FixE2E\NoArgsRule