StrlenFunctionReturnTypeExtension: Cleanup `instanceof ConstantString…

…Type`
phpstan · Jan 5, 2025 · 2048fc8 · 2048fc8
1 parent 2132cc0
commit 2048fc8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1488,11 +1488,6 @@ parameters:
 			count: 1
 			path: src/Type/Php/StrRepeatFunctionReturnTypeExtension.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
-			count: 1
-			path: src/Type/Php/StrlenFunctionReturnTypeExtension.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
 			count: 2

diff --git a/src/Type/Php/StrlenFunctionReturnTypeExtension.php b/src/Type/Php/StrlenFunctionReturnTypeExtension.php
@@ -6,9 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\BooleanType;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerRangeType;
@@ -44,25 +42,20 @@ public function getTypeFromFunctionCall(
 		}
 
 		$argType = $scope->getType($args[0]->value);
-
 		if ($argType->isSuperTypeOf(new BooleanType())->yes()) {
-			$constantScalars = TypeCombinator::remove($argType, new BooleanType())->getConstantScalarTypes();
+			$constantScalars = TypeCombinator::remove($argType, new BooleanType())->getConstantScalarValues();
 			if (count($constantScalars) > 0) {
-				$constantScalars[] = new ConstantBooleanType(true);
-				$constantScalars[] = new ConstantBooleanType(false);
+				$constantScalars[] = true;
+				$constantScalars[] = false;
 			}
 		} else {
-			$constantScalars = $argType->getConstantScalarTypes();
+			$constantScalars = $argType->getConstantScalarValues();
 		}
 
 		$lengths = [];
 		foreach ($constantScalars as $constantScalar) {
-			$stringScalar = $constantScalar->toString();
-			if (!($stringScalar instanceof ConstantStringType)) {
-				$lengths = [];
-				break;
-			}
-			$length = strlen($stringScalar->getValue());
+			$stringScalar = (string) $constantScalar;
+			$length = strlen($stringScalar);
 			$lengths[] = $length;
 		}