Merge branch 'phpstan:2.1.x' into issue/13365

Author: stefanfisk

.github/workflows/e2e-tests.yml

@@ -282,6 +282,9 @@ jobs:
               cd e2e/ignore-error-extension
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/bug-10483
+              ../../bin/phpstan
 
     steps:
       - name: "Checkout"
@@ -392,6 +395,9 @@ jobs:
               cd e2e/composer-version-config
               composer install
               ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/bug13425
+              timeout 15 ../bashunit -a exit_code "1" "../../bin/phpstan analyze src/ plugins/"
 
     steps:
       - name: "Checkout"

Makefile

@@ -105,6 +105,11 @@ lint:
 		--exclude tests/PHPStan/Rules/Constants/data/final-private-const.php \
 		--exclude tests/PHPStan/Rules/Properties/data/abstract-final-property-hook-parse-error.php \
 		--exclude tests/PHPStan/Rules/Playground/data/promote-missing-override.php \
+		--exclude tests/PHPStan/Rules/Traits/data/trait-attributes.php \
+		--exclude tests/PHPStan/Rules/Classes/data/non-class-attribute-class.php \
+		--exclude tests/PHPStan/Rules/Classes/data/enum-cannot-be-attribute.php \
+		--exclude tests/PHPStan/Rules/Classes/data/class-attributes.php \
+		--exclude tests/PHPStan/Rules/Classes/data/enum-attributes.php \
 		src tests
 
 install-paratest:

bin/phpstan

@@ -29,6 +29,13 @@ use Symfony\Component\Console\Helper\ProgressBar;
 	}
 	$devOrPharLoader->unregister();
 
+	// fix missing key for vendor/hoa/protocol/Wrapper.php
+	$existingComposerAutoloadFiles = $GLOBALS['__composer_autoload_files'] ?? [];
+	$GLOBALS['__composer_autoload_files'] = array_merge(
+		$existingComposerAutoloadFiles,
+		array_fill_keys(['3e76f7f02b41af8cea96018933f6b7e3'], true),
+	);
+
 	$autoloaderInWorkingDirectory = $vendorDirectory . '/autoload.php';
 	$composerAutoloaderProjectPaths = [];
 

build/ignore-by-php-version.neon.php

@@ -38,6 +38,11 @@
 } else {
 	$includes[] = __DIR__ . '/new-phpunit.neon';
 }
+
+if (PHP_VERSION_ID < 80300) {
+	$includes[] = __DIR__ . '/str-increment.neon';
+}
+
 $config = [];
 $config['includes'] = $includes;
 

build/str-increment.neon

@@ -0,0 +1,4 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Used function str_increment not found\.#'

compiler/composer.lock

@@ -15,7 +15,7 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#6c034ae018ed7ac2cacf2474f824aede73658afa",
+		"jetbrains/phpstorm-stubs": "dev-master#6a5790124fa07452a48d1f34711fb397d7e42b9d",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.4",
@@ -27,8 +27,8 @@
 		"ondrejmirtes/better-reflection": "6.57.0.0",
 		"ondrejmirtes/composer-attribute-collector": "^1.1.1",
 		"ondrejmirtes/php-merge": "^4.1",
-		"phpstan/php-8-stubs": "0.4.15",
-		"phpstan/phpdoc-parser": "2.2.0",
+		"phpstan/php-8-stubs": "0.4.24",
+		"phpstan/phpdoc-parser": "2.3.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",
 		"react/child-process": "^0.7",
@@ -125,7 +125,8 @@
 				"patches/dom_c.patch"
 			],
 			"nette/di": [
-				"patches/DependencyChecker.patch"
+				"patches/DependencyChecker.patch",
+				"patches/Resolver.patch"
 			],
 			"react/http": [
 				"patches/Sender.patch"