Revert "Cleanup instanceof Type checks"

This partially reverts commit 3b72271.

Author: takaram

src/Analyser/MutatingScope.php

@@ -4367,29 +4367,24 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 			&& !$expr->dim instanceof Expr\PostInc
 		) {
 			$dimType = $scope->getType($expr->dim)->toArrayKey();
-			if ($dimType->isInteger()->yes() || $dimType->isString()->yes()) {
+			if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
 				$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->isInteger()->yes()) {
+					if ($dimType instanceof ConstantIntegerType) {
 						$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,
-						$offsetValueType,
+						TypeCombinator::intersect(
+							TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types)),
+							new HasOffsetValueType($dimType, $type),
+						),
 						$scope->getNativeType($expr->var),
 						$certainty,
 					);