Merge branch '2.1.x' into equals

Author: staabm

build/phpstan.neon

@@ -61,7 +61,6 @@ parameters:
 			- 'PHPStan\Reflection\MissingPropertyFromReflectionException'
 			- 'PHPStan\Reflection\MissingConstantFromReflectionException'
 			- 'PHPStan\Type\CircularTypeAliasDefinitionException'
-			- 'PHPStan\Broker\ClassAutoloadingException'
 			- 'LogicException'
 			- 'Error'
 		check:

conf/bleedingEdge.neon

@@ -6,3 +6,4 @@ parameters:
 		stricterFunctionMap: true
 		reportPreciseLineForUnusedFunctionParameter: true
 		internalTag: true
+		newStaticInAbstractClassStaticMethod: true

conf/config.level0.neon

@@ -110,6 +110,8 @@ conditionalTags:
 		phpstan.restrictedClassNameUsageExtension: %featureToggles.internalTag%
 	PHPStan\Rules\InternalTag\RestrictedInternalFunctionUsageExtension:
 		phpstan.restrictedFunctionUsageExtension: %featureToggles.internalTag%
+	PHPStan\Rules\Classes\NewStaticInAbstractClassStaticMethodRule:
+		phpstan.rules.rule: %featureToggles.newStaticInAbstractClassStaticMethod%
 
 services:
 	-
@@ -178,6 +180,9 @@ services:
 			checkFunctionNameCase: %checkFunctionNameCase%
 			discoveringSymbolsTip: %tips.discoveringSymbols%
 
+	-
+		class: PHPStan\Rules\Classes\NewStaticInAbstractClassStaticMethodRule
+
 	-
 		class: PHPStan\Rules\Constants\OverridingConstantRule
 		arguments:

conf/config.neon

@@ -27,6 +27,7 @@ parameters:
 		stricterFunctionMap: false
 		reportPreciseLineForUnusedFunctionParameter: false
 		internalTag: false
+		newStaticInAbstractClassStaticMethod: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false

conf/parametersSchema.neon

@@ -33,6 +33,7 @@ parametersSchema:
 		stricterFunctionMap: bool()
 		reportPreciseLineForUnusedFunctionParameter: bool()
 		internalTag: bool()
+		newStaticInAbstractClassStaticMethod: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()

src/Analyser/MutatingScope.php

@@ -843,7 +843,7 @@ private function resolveType(string $exprString, Expr $node): Type
 		}
 
 		if ($node instanceof AlwaysRememberedExpr) {
-			return $node->getExprType();
+			return $this->nativeTypesPromoted ? $node->getNativeExprType() : $node->getExprType();
 		}
 
 		if ($node instanceof Expr\BinaryOp\Smaller) {

src/Analyser/NodeScopeResolver.php

@@ -5404,7 +5404,7 @@ private function processAssignVar(
 			$conditionalExpressions = $this->processSureTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);
 			$conditionalExpressions = $this->processSureNotTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);
 
-			$nodeCallback(new VariableAssignNode($var, $assignedExpr, $isAssignOp), $result->getScope());
+			$nodeCallback(new VariableAssignNode($var, $assignedExpr), $result->getScope());
 			$scope = $scope->assignVariable($var->name, $type, $scope->getNativeType($assignedExpr), TrinaryLogic::createYes());
 			foreach ($conditionalExpressions as $exprString => $holders) {
 				$scope = $scope->addConditionalExpressions($exprString, $holders);
@@ -5542,7 +5542,7 @@ private function processAssignVar(
 
 			if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {
 				if ($var instanceof Variable && is_string($var->name)) {
-					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
+					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
 					$scope = $scope->assignVariable($var->name, $valueToWrite, $nativeValueToWrite, TrinaryLogic::createYes());
 				} else {
 					if ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {
@@ -5574,7 +5574,7 @@ private function processAssignVar(
 				}
 			} else {
 				if ($var instanceof Variable) {
-					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
+					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
 				} elseif ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {
 					$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
 					if ($var instanceof PropertyFetch && $var->name instanceof Node\Identifier && !$isAssignOp) {
@@ -5861,7 +5861,7 @@ static function (): void {
 			}
 
 			if ($var instanceof Variable && is_string($var->name)) {
-				$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
+				$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
 				$scope = $scope->assignVariable($var->name, $valueToWrite, $nativeValueToWrite, TrinaryLogic::createYes());
 			} else {
 				if ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {

src/Analyser/UndefinedVariableException.php

@@ -5,6 +5,12 @@
 use PHPStan\AnalysedCodeException;
 use function sprintf;
 
+/**
+ * @api
+ *
+ * Unchecked exception thrown from `PHPStan\Analyser\Scope::getVariableType()`
+ * in case the user doesn't check `hasVariableType()` is not `no()`.
+ */
 final class UndefinedVariableException extends AnalysedCodeException
 {
 

src/Broker/ClassAutoloadingException.php

@@ -5,6 +5,13 @@
 use PHPStan\AnalysedCodeException;
 use function sprintf;
 
+/**
+ * @api
+ *
+ * Unchecked exception thrown from `ReflectionProvider` and other places
+ * in case the user does not check the existence of the class beforehand
+ * with `hasClass()` or similar.
+ */
 final class ClassNotFoundException extends AnalysedCodeException
 {