Merge branch '2.1.x' into patch-1

Author: keradus

.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"

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\.#'

composer.json

@@ -28,7 +28,7 @@
 		"ondrejmirtes/composer-attribute-collector": "^1.1.1",
 		"ondrejmirtes/php-merge": "^4.1",
 		"phpstan/php-8-stubs": "0.4.24",
-		"phpstan/phpdoc-parser": "2.2.0",
+		"phpstan/phpdoc-parser": "2.3.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",
 		"react/child-process": "^0.7",

composer.lock

@@ -8,3 +8,4 @@ parameters:
 		reportPreciseLineForUnusedFunctionParameter: true
 		internalTag: true
 		newStaticInAbstractClassStaticMethod: true
+		checkExtensionsForComparisonOperators: true

conf/bleedingEdge.neon

@@ -31,6 +31,7 @@ parameters:
 		reportPreciseLineForUnusedFunctionParameter: false
 		internalTag: false
 		newStaticInAbstractClassStaticMethod: false
+		checkExtensionsForComparisonOperators: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false

conf/config.neon

@@ -35,6 +35,7 @@ parametersSchema:
 		reportPreciseLineForUnusedFunctionParameter: bool()
 		internalTag: bool()
 		newStaticInAbstractClassStaticMethod: bool()
+		checkExtensionsForComparisonOperators: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()
@@ -158,7 +159,7 @@ parametersSchema:
 	resultCachePath: string()
 	resultCacheSkipIfOlderThanDays: int()
 	resultCacheChecksProjectExtensionFilesDependencies: bool()
-	dynamicConstantNames: listOf(string())
+	dynamicConstantNames: arrayOf(string())
 	customRulesetUsed: schema(bool(), nullable())
 	rootDir: string()
 	tmpDir: string()

conf/parametersSchema.neon

@@ -0,0 +1,10 @@
+<?php
+
+define("FILTER_VALIDATE_FLOAT",false);
+
+/** @return mixed */
+function doFoo() { return null; }
+
+$mixed = doFoo();
+if (filter_var($mixed, FILTER_VALIDATE_BOOLEAN)) {
+}