Merge branch '2.1.x' into Assert-and-throws-are-side-effects

Author: jack-worman

.github/workflows/e2e-tests.yml

@@ -233,6 +233,16 @@ jobs:
               cd e2e/bug-11857
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/result-cache-meta-extension
+              composer install
+              ../../bin/phpstan -vvv
+              ../../bin/phpstan -vvv --fail-without-result-cache
+              echo 'modified-hash' > hash.txt
+              OUTPUT=$(../bashunit -a exit_code "2" "../../bin/phpstan -vvv --fail-without-result-cache")
+              echo "$OUTPUT"
+              ../bashunit -a matches "Note: Using configuration file .+phpstan.neon." "$OUTPUT"
+              ../bashunit -a contains 'Result cache not used because the metadata do not match: metaExtensions' "$OUTPUT"
 
     steps:
       - name: "Checkout"

composer.json

@@ -15,16 +15,16 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#db675e059f57071e8209c99075128b92d8a727e7",
+		"jetbrains/phpstorm-stubs": "dev-master#62a683f61d9ea11ef8caf8b2ad54e59e92b2c670",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.4",
 		"nette/php-generator": "3.6.9",
 		"nette/schema": "^1.2.2",
 		"nette/utils": "^3.2.5",
-		"nikic/php-parser": "^5.3.0",
+		"nikic/php-parser": "^5.4.0",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "6.49.0.0",
+		"ondrejmirtes/better-reflection": "6.51.0.1",
 		"phpstan/php-8-stubs": "0.4.9",
 		"phpstan/phpdoc-parser": "2.0.0",
 		"psr/http-message": "^1.1",

composer.lock

@@ -1,10 +1,6 @@
 parameters:
 	customRulesetUsed: false
 
-conditionalTags:
-	PHPStan\Rules\Properties\UninitializedPropertyRule:
-		phpstan.rules.rule: %checkUninitializedProperties%
-
 rules:
 	- PHPStan\Rules\Api\ApiInstanceofRule
 	- PHPStan\Rules\Api\ApiInstanceofTypeRule
@@ -218,9 +214,6 @@ services:
 		tags:
 			- phpstan.rules.rule
 
-	-
-		class: PHPStan\Rules\Properties\UninitializedPropertyRule
-
 	-
 		class: PHPStan\Rules\Properties\WritingToReadOnlyPropertiesRule
 		arguments:
@@ -250,11 +243,6 @@ services:
 		tags:
 			- phpstan.rules.rule
 
-	-
-		class: PHPStan\Reflection\ConstructorsHelper
-		arguments:
-			additionalConstructors: %additionalConstructors%
-
 	-
 		class: PHPStan\Rules\Keywords\RequireFileExistsRule
 		arguments:

conf/config.level0.neon

@@ -22,7 +22,6 @@ rules:
 	- PHPStan\Rules\Properties\ReadOnlyPropertyAssignRefRule
 	- PHPStan\Rules\Properties\ReadOnlyByPhpDocPropertyAssignRefRule
 	- PHPStan\Rules\Properties\SetNonVirtualPropertyHookAssignRule
-	- PHPStan\Rules\Properties\ShortGetPropertyHookReturnTypeRule
 	- PHPStan\Rules\Properties\TypesAssignedToPropertiesRule
 	- PHPStan\Rules\Variables\ParameterOutAssignedTypeRule
 	- PHPStan\Rules\Variables\ParameterOutExecutionEndTypeRule

conf/config.level3.neon

@@ -211,6 +211,8 @@ conditionalTags:
 		phpstan.rules.rule: %exceptions.check.missingCheckedExceptionInThrows%
 	PHPStan\Rules\Exceptions\MissingCheckedExceptionInPropertyHookThrowsRule:
 		phpstan.rules.rule: %exceptions.check.missingCheckedExceptionInThrows%
+	PHPStan\Rules\Properties\UninitializedPropertyRule:
+		phpstan.rules.rule: %checkUninitializedProperties%
 
 services:
 	-
@@ -320,11 +322,6 @@ services:
 		tags:
 			- phpstan.parser.richParserNodeVisitor
 
-	-
-		class: PHPStan\Parser\PropertyHookNameVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
 	-
 		class: PHPStan\Node\Printer\ExprPrinter
 
@@ -739,6 +736,11 @@ services:
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 
+	-
+		class: PHPStan\Reflection\ConstructorsHelper
+		arguments:
+			additionalConstructors: %additionalConstructors%
+
 	-
 		class: PHPStan\Reflection\RequireExtension\RequireExtendsMethodsClassReflectionExtension
 
@@ -991,6 +993,9 @@ services:
 	-
 		class: PHPStan\Rules\Methods\MethodParameterComparisonHelper
 
+	-
+		class: PHPStan\Rules\Methods\MethodVisibilityComparisonHelper
+
 	-
 		class: PHPStan\Rules\MissingTypehintCheck
 		arguments:
@@ -1039,6 +1044,9 @@ services:
 			reportMagicProperties: %reportMagicProperties%
 			checkDynamicProperties: %checkDynamicProperties%
 
+	-
+		class: PHPStan\Rules\Properties\UninitializedPropertyRule
+
 	-
 		class: PHPStan\Rules\Properties\LazyReadWritePropertiesExtensionProvider
 

conf/config.neon

@@ -0,0 +1 @@
+/vendor

e2e/result-cache-meta-extension/.gitignore

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

e2e/result-cache-meta-extension/composer.json

@@ -0,0 +1 @@
+initial-hash