Drop strval()/intval() forms from decimal-int-string round-trip detection

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: phpstan-bot

src/Analyser/TypeSpecifier.php

@@ -2971,7 +2971,7 @@ public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, Ty
 	/**
 	 * When $castExpr casts $valueExpr to an int and back to a string — i.e. the
 	 * `(string) (int) $valueExpr` round-trip (in any combination of the (string)/(int)
-	 * casts and the strval()/intval() function forms) — returns $valueExpr so the
+	 * casts) — returns $valueExpr so the
 	 * comparison `$castExpr === $valueExpr` can narrow it to a decimal / non-decimal
 	 * integer string. This is the canonical "decimal integer string" round-trip that
 	 * ConstantStringType::isDecimalIntegerString() checks with `(string) (int) $value === $value`.
@@ -3008,24 +3008,14 @@ private function getDecimalIntegerStringRoundTripExpr(Expr $castExpr, Expr $valu
 	}
 
 	/**
-	 * Strips a single (string)/(int) cast or strval()/intval() call, returning its inner expression.
+	 * Strips a single (string)/(int) cast, returning its inner expression.
 	 */
 	private function getCastInnerExpr(Expr $expr): ?Expr
 	{
 		if ($expr instanceof Expr\Cast\String_ || $expr instanceof Expr\Cast\Int_) {
 			return $expr->expr;
 		}
 
-		if (
-			$expr instanceof FuncCall
-			&& $expr->name instanceof Name
-			&& !$expr->isFirstClassCallable()
-			&& in_array(strtolower($expr->name->toString()), ['strval', 'intval'], true)
-			&& count($expr->getArgs()) === 1
-		) {
-			return $expr->getArgs()[0]->value;
-		}
-
 		return null;
 	}
 
@@ -3291,7 +3281,7 @@ private function resolveNormalizedIdentical(Expr\BinaryOp\Identical $expr, Scope
 			}
 		}
 
-		// (string) (int) $x === $x  (and the strval(intval()) equivalents)
+		// (string) (int) $x === $x
 		if (!$context->null()) {
 			$decimalValueExpr = $this->getDecimalIntegerStringRoundTripExpr($unwrappedLeftExpr, $unwrappedRightExpr, $scope)
 				?? $this->getDecimalIntegerStringRoundTripExpr($unwrappedRightExpr, $unwrappedLeftExpr, $scope);

tests/PHPStan/Analyser/nsrt/decimal-int-string-cast.php

@@ -3,8 +3,6 @@
 namespace DecimalIntStringCast;
 
 use function PHPStan\Testing\assertType;
-use function intval;
-use function strval;
 
 class Foo
 {
@@ -36,26 +34,6 @@ public function castNotIdentical(string $s): void
 		}
 	}
 
-	public function strvalIntval(string $s): void
-	{
-		if (strval(intval($s)) === $s) {
-			assertType('decimal-int-string', $s);
-		} else {
-			assertType('non-decimal-int-string', $s);
-		}
-	}
-
-	public function mixedCastForms(string $s): void
-	{
-		if (strval((int) $s) === $s) {
-			assertType('decimal-int-string', $s);
-		}
-
-		if ((string) intval($s) === $s) {
-			assertType('decimal-int-string', $s);
-		}
-	}
-
 	public function notAlwaysString(int|string $s): void
 	{
 		if ((string) (int) $s === $s) {