More specific type for 'port' component of 'parse_url()'

phpstan · Aug 15, 2022 · 9775464 · 9775464
1 parent 4b6d964
commit 9775464
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Type/Php/ParseUrlFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ParseUrlFunctionDynamicReturnTypeExtension.php
@@ -13,7 +13,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
-use PHPStan\Type\IntegerType;
+use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -122,17 +122,17 @@ private function cacheReturnTypes(): void
 		}
 
 		$string = new StringType();
-		$integer = new IntegerType();
+		$port = IntegerRangeType::fromInterval(0, 65535);
 		$false = new ConstantBooleanType(false);
 		$null = new NullType();
 
 		$stringOrFalseOrNull = TypeCombinator::union($string, $false, $null);
-		$integerOrFalseOrNull = TypeCombinator::union($integer, $false, $null);
+		$portOrFalseOrNull = TypeCombinator::union($port, $false, $null);
 
 		$this->componentTypesPairedConstants = [
 			PHP_URL_SCHEME => $stringOrFalseOrNull,
 			PHP_URL_HOST => $stringOrFalseOrNull,
-			PHP_URL_PORT => $integerOrFalseOrNull,
+			PHP_URL_PORT => $portOrFalseOrNull,
 			PHP_URL_USER => $stringOrFalseOrNull,
 			PHP_URL_PASS => $stringOrFalseOrNull,
 			PHP_URL_PATH => $stringOrFalseOrNull,
@@ -143,7 +143,7 @@ private function cacheReturnTypes(): void
 		$this->componentTypesPairedStrings = [
 			'scheme' => $string,
 			'host' => $string,
-			'port' => $integer,
+			'port' => $port,
 			'user' => $string,
 			'pass' => $string,
 			'path' => $string,

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -5385,7 +5385,7 @@ public function dataFunctions(): array
 				'$parseUrlConstantUrlWithoutComponent2',
 			],
 			[
-				'array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false',
+				'array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false',
 				'$parseUrlConstantUrlUnknownComponent',
 			],
 			[
@@ -5405,11 +5405,11 @@ public function dataFunctions(): array
 				'$parseUrlStringUrlWithComponentInvalid',
 			],
 			[
-				'int|false|null',
+				'int<0, 65535>|false|null',
 				'$parseUrlStringUrlWithComponentPort',
 			],
 			[
-				'array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false',
+				'array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false',
 				'$parseUrlStringUrlWithoutComponent',
 			],
 			[