Install symfony/polyfill-php83

Author: ondrejmirtes

compiler/build/scoper.inc.php

@@ -18,6 +18,7 @@
 	'../../vendor/phpstan/php-8-stubs/stubs',
 	'../../vendor/symfony/polyfill-php80',
 	'../../vendor/symfony/polyfill-php81',
+	'../../vendor/symfony/polyfill-php83',
 	'../../vendor/symfony/polyfill-mbstring',
 	'../../vendor/symfony/polyfill-intl-normalizer',
 	'../../vendor/symfony/polyfill-intl-grapheme',

composer.json

@@ -46,6 +46,7 @@
 		"symfony/polyfill-mbstring": "^1.23",
 		"symfony/polyfill-php80": "^1.23",
 		"symfony/polyfill-php81": "^1.27",
+		"symfony/polyfill-php83": "^1.33",
 		"symfony/process": "^5.4.3",
 		"symfony/service-contracts": "^2.5.0",
 		"symfony/string": "^5.4.3"

composer.lock

@@ -139,6 +139,7 @@
 use PHPStan\Type\VoidType;
 use stdClass;
 use Throwable;
+use ValueError;
 use function abs;
 use function array_filter;
 use function array_key_exists;
@@ -151,17 +152,16 @@
 use function array_values;
 use function count;
 use function explode;
-use function function_exists;
 use function get_class;
 use function implode;
 use function in_array;
 use function is_array;
 use function is_bool;
-use function is_numeric;
 use function is_string;
 use function ltrim;
 use function md5;
 use function sprintf;
+use function str_decrement;
 use function str_increment;
 use function str_starts_with;
 use function strlen;
@@ -1768,19 +1768,25 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 					if ($node instanceof Expr\PreInc) {
 						if ($varValue === '') {
 							$varValue = '1';
-						} elseif (
-							is_string($varValue)
-							&& !is_numeric($varValue)
-							&& function_exists('str_increment')
-						) {
-							$varValue = str_increment($varValue);
+						} elseif (is_string($varValue)) {
+							try {
+								$varValue = str_increment($varValue);
+							} catch (ValueError) {
+								return new NeverType();
+							}
 						} elseif (!is_bool($varValue)) {
 							++$varValue;
 						}
 					} else {
 						if ($varValue === '') {
 							$varValue = -1;
-						} elseif (is_numeric($varValue)) {
+						} elseif (is_string($varValue)) {
+							try {
+								$varValue = str_decrement($varValue);
+							} catch (ValueError) {
+								return new NeverType();
+							}
+						} elseif (!is_bool($varValue)) {
 							--$varValue;
 						}
 					}

src/Analyser/MutatingScope.php

@@ -6,26 +6,19 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
-use PHPStan\Type\ErrorType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use function chr;
+use ValueError;
 use function count;
-use function function_exists;
-use function implode;
 use function in_array;
 use function is_float;
 use function is_int;
-use function is_numeric;
 use function is_string;
-use function ord;
-use function preg_match;
+use function str_decrement;
 use function str_increment;
-use function str_split;
-use function stripos;
 
 #[AutowiredService]
 final class StrIncrementDecrementFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
@@ -61,10 +54,6 @@ public function getTypeFromFunctionCall(
 			}
 			$string = (string) $value;
 
-			if (preg_match('/\A(?:0|[1-9A-Za-z][0-9A-Za-z]*)+\z/', $string) < 1) {
-				continue;
-			}
-
 			$result = null;
 			if ($fnName === 'str_increment') {
 				$result = $this->increment($string);
@@ -80,77 +69,34 @@ public function getTypeFromFunctionCall(
 		}
 
 		return count($types) === 0
-			? new ErrorType()
+			? new NeverType()
 			: TypeCombinator::union(...$types);
 	}
 
-	private function increment(string $s): string
+	private function increment(string $s): ?string
 	{
-		if (is_numeric($s)) {
-			$offset = stripos($s, 'e');
-			if ($offset !== false) {
-				// Using increment operator would cast the string to float
-				// Therefore we manually increment it to convert it to an "f"/"F" that doesn't get affected
-				$c = $s[$offset];
-				$c++;
-				$s[$offset] = $c;
-				$s++;
-				$s[$offset] = [
-					'f' => 'e',
-					'F' => 'E',
-					'g' => 'f',
-					'G' => 'F',
-				][$s[$offset]];
-
-				return $s;
-			}
-		}
-
 		if ($s === '') {
-			throw new ShouldNotHappenException();
+			return null;
 		}
 
-		if (function_exists('str_increment')) {
+		try {
 			return str_increment($s);
+		} catch (ValueError) {
+			return null;
 		}
-
-		return (string) ++$s;
 	}
 
 	private function decrement(string $s): ?string
 	{
-		if (in_array($s, ['a', 'A', '0'], true)) {
+		if ($s === '') {
 			return null;
 		}
 
-		$decremented = str_split($s, 1);
-		$position = count($decremented) - 1;
-		$carry = false;
-		$map = [
-			'0' => '9',
-			'A' => 'Z',
-			'a' => 'z',
-		];
-		do {
-			$c = $decremented[$position];
-			if (!in_array($c, ['a', 'A', '0'], true)) {
-				$carry = false;
-				$decremented[$position] = chr(ord($c) - 1);
-			} else {
-				$carry = true;
-				$decremented[$position] = $map[$c];
-			}
-		} while ($carry && $position-- > 0);
-
-		if ($carry || count($decremented) > 1 && $decremented[0] === '0') {
-			if (count($decremented) === 1) {
-				return null;
-			}
-
-			unset($decremented[0]);
+		try {
+			return str_decrement($s);
+		} catch (ValueError) {
+			return null;
 		}
-
-		return implode($decremented);
 	}
 
 }

src/Type/Php/StrIncrementDecrementFunctionReturnTypeExtension.php

@@ -68,6 +68,7 @@ public function testExpectedFiles(): void
 			'symfony/polyfill-mbstring/bootstrap.php', // afaik polyfills aren't necessary
 			'symfony/polyfill-php80/bootstrap.php', // afaik polyfills aren't necessary
 			'symfony/polyfill-php81/bootstrap.php', // afaik polyfills aren't necessary
+			'symfony/polyfill-php83/bootstrap.php', // afaik polyfills aren't necessary
 			'symfony/string/Resources/functions.php', // afaik polyfills aren't necessary
 		];