Merge remote-tracking branch 'origin/2.2.x' into 2.3.x

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -140,6 +140,16 @@ jobs:
               OUTPUT=$(../../bin/phpstan -vvv 2>&1)
               echo "$OUTPUT"
               ../bashunit -a contains 'Result cache restored. 0 files will be reanalysed.' "$OUTPUT"
+          - script: |
+              cd e2e/result-cache-11
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              patch -b src/Coll.php < patch-1.patch
+              cat baseline-1.neon > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
+              mv src/Coll.php.orig src/Coll.php
+              echo -n > phpstan-baseline.neon
+              ../../bin/phpstan -vvv
           - script: |
               cd e2e/bug-14514
               composer install
@@ -842,7 +852,7 @@ jobs:
               composer update test/logger --no-cache
               OUTPUT=$(../bashunit -a exit_code "0" "../../bin/phpstan analyse -vv")
               echo "$OUTPUT"
-              ../bashunit -a contains 'Composer packages changed (test/logger); re-analysing only the files depending on them.' "$OUTPUT"
+              ../bashunit -a contains 'Composer packages changed (test/logger); re-analysing the files depending on them and the files with errors.' "$OUTPUT"
               ../bashunit -a contains 'Result cache restored. 1 file will be reanalysed.' "$OUTPUT"
           - script: |
               cd e2e/result-cache-path-repository
@@ -853,7 +863,7 @@ jobs:
               composer update psr/log --no-cache
               OUTPUT=$(../bashunit -a exit_code "0" "../../bin/phpstan analyse -vv")
               echo "$OUTPUT"
-              ../bashunit -a contains 'Composer packages changed (psr/log); re-analysing only the files depending on them.' "$OUTPUT"
+              ../bashunit -a contains 'Composer packages changed (psr/log); re-analysing the files depending on them and the files with errors.' "$OUTPUT"
               ../bashunit -a contains 'Result cache restored. 1 file will be reanalysed.' "$OUTPUT"
               # Editing a file of an installed package is not a valid thing to do - the next Composer
               # command overwrites it - so PHPStan does not track it and keeps the cached results, even
@@ -965,6 +975,25 @@ jobs:
               OUTPUT=$(../bashunit -a exit_code "0" "../../bin/phpstan analyse -vv --error-format raw")
               echo "$OUTPUT"
               ../bashunit -a not_contains 'is not a file or it does not exist' "$OUTPUT"
+          - script: |
+              cd e2e/result-cache-vendor-class-appears
+              composer install
+              # The class does not exist yet, and an error about a class that does not exist records no
+              # dependency on anything - there is no file to point at.
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Foo.php:10:Parameter $logger of method ResultCacheE2EVendorClassAppears\Foo::doFoo() has invalid type Psr\Log\PluginProvidedLogger.' "$OUTPUT"
+              # Composer updates the package, and a plugin writes the class into it on the way - which is
+              # what phpstan/phpstan#15164 is about. Nothing the cache knows about points at that file,
+              # so the files with errors have to be re-analysed on a package change; otherwise the error
+              # stands while a run from a cleared cache reports nothing.
+              patch -p0 < updatePsrLog.patch
+              composer update psr/log --no-cache
+              cp plugin-writes/PluginProvidedLogger.php vendor/psr/log/src/PluginProvidedLogger.php
+              OUTPUT=$(../bashunit -a exit_code "0" "../../bin/phpstan analyse -vv --error-format raw")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Composer packages changed (psr/log); re-analysing the files depending on them and the files with errors.' "$OUTPUT"
+              ../bashunit -a not_contains 'has invalid type Psr\Log\PluginProvidedLogger' "$OUTPUT"
           - script: |
               cd e2e/result-cache-extension-update
               composer install

conf/bleedingEdge.neon

@@ -26,3 +26,4 @@ parameters:
 		finiteTypesInHaystack: true
 		switchConditionAlwaysFalse: true
 		checkImportedClassNameCase: true
+		sortWithoutEffect: true

conf/config.level5.neon

@@ -12,6 +12,8 @@ conditionalTags:
 		phpstan.rules.rule: %featureToggles.checkPrintfParameterTypes%
 	PHPStan\Rules\DateIntervalInstantiationRule:
 		phpstan.rules.rule: %featureToggles.checkDateIntervalConstructor%
+	PHPStan\Rules\Functions\SortWithoutEffectRule:
+		phpstan.rules.rule: %featureToggles.sortWithoutEffect%
 
 autowiredAttributeServices:
 	# registers rules with #[RegisteredRule] attribute
@@ -26,3 +28,8 @@ services:
 			checkStrictPrintfPlaceholderTypes: %checkStrictPrintfPlaceholderTypes%
 	-
 		class: PHPStan\Rules\DateIntervalInstantiationRule
+	-
+		class: PHPStan\Rules\Functions\SortWithoutEffectRule
+		arguments:
+			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
+			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%

conf/config.neon

@@ -57,6 +57,7 @@ parameters:
 		finiteTypesInHaystack: false
 		switchConditionAlwaysFalse: false
 		checkImportedClassNameCase: false
+		sortWithoutEffect: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false

conf/parametersSchema.neon

@@ -55,6 +55,7 @@ parametersSchema:
 		finiteTypesInHaystack: bool()
 		switchConditionAlwaysFalse: bool()
 		checkImportedClassNameCase: bool()
+		sortWithoutEffect: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()

e2e/result-cache-11/baseline-1.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Cannot call method name\(\) on TestResultCache11\\Item\|false\.$#'
+			identifier: method.nonObject
+			count: 1
+			path: src/consumer.php

e2e/result-cache-11/patch-1.patch

@@ -0,0 +1,13 @@
+diff --git a/e2e/result-cache-11/src/Coll.php b/e2e/result-cache-11/src/Coll.php
+index 9a6395d..773bb21 100644
+--- a/e2e/result-cache-11/src/Coll.php
++++ b/e2e/result-cache-11/src/Coll.php
+@@ -4,7 +4,7 @@ namespace TestResultCache11;
+ 
+ /**
+  * @template TValue of object
+- * @extends \Iterator<int, TValue>
++ * @extends \Iterator<int, TValue|false>
+  */
+ interface Coll extends \Iterator
+ {

e2e/result-cache-11/phpstan-baseline.neon

@@ -0,0 +1,8 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 8
+	paths:
+		- src
+

e2e/result-cache-11/phpstan.neon

@@ -0,0 +1,12 @@
+<?php
+
+namespace TestResultCache11;
+
+/**
+ * @template TValue of object
+ * @extends \Iterator<int, TValue>
+ */
+interface Coll extends \Iterator
+{
+}
+