Remove mentions of scalar node types in favor of constant types

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -57,6 +57,7 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\CommentHelper;
 use PHPStan\Type\Constant\ConstantArrayType;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\IntegerType;
@@ -232,11 +233,14 @@ private function specifyFetchedPropertyForInnerScope(Node $node, Scope $inScope,
 				&& $node->name instanceof Name
 				&& $this->broker->resolveFunctionName($node->name, $scope) === 'property_exists'
 				&& count($node->args) === 2
-				&& $node->args[1]->value instanceof  Node\Scalar\String_
 			) {
-				$scope = $scope->specifyFetchedPropertyFromIsset(
-					new PropertyFetch($node->args[0]->value, $node->args[1]->value->value)
-				);
+				$secondArgumentType = $scope->getType($node->args[1]->value);
+
+				if ($secondArgumentType instanceof ConstantStringType) {
+					$scope = $scope->specifyFetchedPropertyFromIsset(
+						new PropertyFetch($node->args[0]->value, $secondArgumentType->getValue())
+					);
+				}
 			}
 		} else {
 			if ($node instanceof Expr\Empty_) {
@@ -367,8 +371,8 @@ private function processNode(\PhpParser\Node $node, Scope $scope, \Closure $node
 					&& $argValue->class instanceof Name
 				) {
 					$scopeClass = $scope->resolveName($argValue->class);
-				} elseif ($argValue instanceof Node\Scalar\String_) {
-					$scopeClass = $argValue->value;
+				} elseif ($argValueType instanceof ConstantStringType) {
+					$scopeClass = $argValueType->getValue();
 				}
 			}
 			$closureBindScope = $scope->enterClosureBind($thisType, $scopeClass);

src/Analyser/TypeSpecifier.php

@@ -20,6 +20,7 @@
 use PHPStan\Type\CallableType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IterableType;
@@ -168,10 +169,8 @@ public function specifyTypesInCondition(Scope $scope, Expr $expr, int $context =
 				case 'is_a':
 					if (isset($expr->args[1])) {
 						$classNameArgExpr = $expr->args[1]->value;
-						if ($classNameArgExpr instanceof Node\Scalar\String_) {
-							$objectType = new ObjectType($classNameArgExpr->value);
-							$types = $this->create($innerExpr, $objectType, $context);
-						} elseif (
+						$classNameArgExprType = $scope->getType($classNameArgExpr);
+						if (
 							$classNameArgExpr instanceof Expr\ClassConstFetch
 							&& $classNameArgExpr->class instanceof Name
 							&& is_string($classNameArgExpr->name)
@@ -184,6 +183,9 @@ public function specifyTypesInCondition(Scope $scope, Expr $expr, int $context =
 								$objectType = new ObjectType($className);
 							}
 							$types = $this->create($innerExpr, $objectType, $context);
+						} elseif ($classNameArgExprType instanceof ConstantStringType) {
+							$objectType = new ObjectType($classNameArgExprType->getValue());
+							$types = $this->create($innerExpr, $objectType, $context);
 						} elseif ($context & self::CONTEXT_TRUE) {
 							$objectType = new ObjectWithoutClassType();
 							$types = $this->create($innerExpr, $objectType, $context);

src/Rules/Classes/UnusedConstructorParametersRule.php

@@ -45,6 +45,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		return $this->check->getUnusedParameters(
+			$scope,
 			array_map(function (Param $parameter): string {
 				return $parameter->name;
 			}, $node->params),

src/Rules/Functions/UnusedClosureUsesRule.php

@@ -34,6 +34,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		return $this->check->getUnusedParameters(
+			$scope,
 			array_map(function (Node\Expr\ClosureUse $use): string {
 				return $use->var;
 			}, $node->uses),

src/Rules/UnusedFunctionParametersCheck.php

@@ -3,24 +3,28 @@
 namespace PHPStan\Rules;
 
 use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+use PHPStan\Type\Constant\ConstantStringType;
 
 class UnusedFunctionParametersCheck
 {
 
 	/**
+	 * @param \PHPStan\Analyser\Scope $scope
 	 * @param string[] $parameterNames
 	 * @param \PhpParser\Node[] $statements
 	 * @param string $unusedParameterMessage
 	 * @return string[]
 	 */
 	public function getUnusedParameters(
+		Scope $scope,
 		array $parameterNames,
 		array $statements,
 		string $unusedParameterMessage
 	): array
 	{
 		$unusedParameters = array_fill_keys($parameterNames, true);
-		foreach ($this->getUsedVariables($statements) as $variableName) {
+		foreach ($this->getUsedVariables($scope, $statements) as $variableName) {
 			if (isset($unusedParameters[$variableName])) {
 				unset($unusedParameters[$variableName]);
 			}
@@ -34,10 +38,11 @@ public function getUnusedParameters(
 	}
 
 	/**
+	 * @param \PHPStan\Analyser\Scope $scope
 	 * @param \PhpParser\Node[]|\PhpParser\Node $node
 	 * @return string[]
 	 */
-	private function getUsedVariables($node): array
+	private function getUsedVariables(Scope $scope, $node): array
 	{
 		$variableNames = [];
 		if ($node instanceof Node) {
@@ -53,8 +58,9 @@ private function getUsedVariables($node): array
 				&& (string) $node->name === 'compact'
 			) {
 				foreach ($node->args as $arg) {
-					if ($arg->value instanceof Node\Scalar\String_) {
-						$variableNames[] = $arg->value->value;
+					$argType = $scope->getType($arg->value);
+					if ($argType instanceof ConstantStringType) {
+						$variableNames[] = $argType->getValue();
 					}
 				}
 			}
@@ -63,11 +69,11 @@ private function getUsedVariables($node): array
 					continue;
 				}
 				$subNode = $node->{$subNodeName};
-				$variableNames = array_merge($variableNames, $this->getUsedVariables($subNode));
+				$variableNames = array_merge($variableNames, $this->getUsedVariables($scope, $subNode));
 			}
 		} elseif (is_array($node)) {
 			foreach ($node as $subNode) {
-				$variableNames = array_merge($variableNames, $this->getUsedVariables($subNode));
+				$variableNames = array_merge($variableNames, $this->getUsedVariables($scope, $subNode));
 			}
 		}