Cleanup instanceof Type checks

Author: staabm

src/Analyser/MutatingScope.php

@@ -4310,24 +4310,29 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 		$scope = $this;
 		if ($expr instanceof Expr\ArrayDimFetch && $expr->dim !== null) {
 			$dimType = $scope->getType($expr->dim)->toArrayKey();
-			if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
+			if ($dimType->isInteger()->yes() || $dimType->isString()->yes()) {
 				$exprVarType = $scope->getType($expr->var);
 				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
 					$types = [
 						new ArrayType(new MixedType(), new MixedType()),
 						new ObjectType(ArrayAccess::class),
 						new NullType(),
 					];
-					if ($dimType instanceof ConstantIntegerType) {
+					if ($dimType->isInteger()->yes()) {
 						$types[] = new StringType();
 					}
+					$offsetValueType = TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types));
+
+					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
+						$offsetValueType = TypeCombinator::intersect(
+							$offsetValueType,
+							new HasOffsetValueType($dimType, $type),
+						);
+					}
 
 					$scope = $scope->specifyExpressionType(
 						$expr->var,
-						TypeCombinator::intersect(
-							TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types)),
-							new HasOffsetValueType($dimType, $type),
-						),
+						$offsetValueType,
 						$scope->getNativeType($expr->var),
 						$certainty,
 					);

src/Rules/UnusedFunctionParametersCheck.php

@@ -9,8 +9,6 @@
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
-use function array_combine;
-use function array_map;
 use function array_merge;
 use function in_array;
 use function is_array;
@@ -43,20 +41,18 @@ public function getUnusedParameters(
 		string $identifier,
 	): array
 	{
-		$parameterNames = array_map(static function (Variable $variable): string {
+		$unusedParameters = [];
+		foreach ($parameterVars as $variable) {
 			if (!is_string($variable->name)) {
 				throw new ShouldNotHappenException();
 			}
-			return $variable->name;
-		}, $parameterVars);
-		$unusedParameters = array_combine($parameterNames, $parameterVars);
-		foreach ($this->getUsedVariables($scope, $statements) as $variableName) {
-			if (!isset($unusedParameters[$variableName])) {
-				continue;
-			}
 
+			$unusedParameters[$variable->name] = $variable;
+		}
+		foreach ($this->getUsedVariables($scope, $statements) as $variableName) {
 			unset($unusedParameters[$variableName]);
 		}
+
 		$errors = [];
 		foreach ($unusedParameters as $name => $variable) {
 			$errorBuilder = RuleErrorBuilder::message(sprintf($unusedParameterMessage, $name))->identifier($identifier);