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

thg2k · ondrejmirtes · commit 4add21818be4 · 2022-08-16T13:30:02.000+02:00
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',
 			],
 			[
diff --git a/tests/PHPStan/Analyser/data/bug-2001.php b/tests/PHPStan/Analyser/data/bug-2001.php
@@ -9,28 +9,28 @@ class HelloWorld
 	public function parseUrl(string $url): string
 	{
 		$parsedUrl = parse_url(urldecode($url));
-		assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
 
 		if (array_key_exists('host', $parsedUrl)) {
-			assertType('array{scheme?: string, host: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+			assertType('array{scheme?: string, host: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
 			throw new \RuntimeException('Absolute URLs are prohibited for the redirectTo parameter.');
 		}
 
-		assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
 
 		$redirectUrl = $parsedUrl['path'];
 
 		if (array_key_exists('query', $parsedUrl)) {
-			assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
 			$redirectUrl .= '?' . $parsedUrl['query'];
 		}
 
 		if (array_key_exists('fragment', $parsedUrl)) {
-			assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
 			$redirectUrl .= '#' . $parsedUrl['query'];
 		}
 
-		assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
 
 		return $redirectUrl;
 	}
diff --git a/tests/PHPStan/Analyser/data/bug-3009.php b/tests/PHPStan/Analyser/data/bug-3009.php
@@ -11,18 +11,18 @@ public function createRedirectRequest(string $redirectUri): ?string
 	{
 		$redirectUrlParts = parse_url($redirectUri);
 		if (false === is_array($redirectUrlParts) || true === array_key_exists('host', $redirectUrlParts)) {
-			assertType('array{scheme?: string, host: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $redirectUrlParts);
+			assertType('array{scheme?: string, host: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $redirectUrlParts);
 			return null;
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);
 
 		if (true === array_key_exists('query', $redirectUrlParts)) {
-			assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $redirectUrlParts);
+			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $redirectUrlParts);
 			$redirectServer['QUERY_STRING'] = $redirectUrlParts['query'];
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);
 
 		return 'foo';
 	}

Original file line number	Diff line number	Diff line change
`@@ -5385,7 +5385,7 @@ public function dataFunctions(): array`
`5385`	`5385`	`'$parseUrlConstantUrlWithoutComponent2',`
`5386`	`5386`	`],`
`5387`	`5387`	`[`
`5388`		`- 'array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false',`
	`5388`	`+ 'array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false',`
`5389`	`5389`	`'$parseUrlConstantUrlUnknownComponent',`
`5390`	`5390`	`],`
`5391`	`5391`	`[`
`@@ -5405,11 +5405,11 @@ public function dataFunctions(): array`
`5405`	`5405`	`'$parseUrlStringUrlWithComponentInvalid',`
`5406`	`5406`	`],`
`5407`	`5407`	`[`
`5408`		`- 'int\|false\|null',`
	`5408`	`+ 'int<0, 65535>\|false\|null',`
`5409`	`5409`	`'$parseUrlStringUrlWithComponentPort',`
`5410`	`5410`	`],`
`5411`	`5411`	`[`
`5412`		`- 'array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false',`
	`5412`	`+ 'array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false',`
`5413`	`5413`	`'$parseUrlStringUrlWithoutComponent',`
`5414`	`5414`	`],`
`5415`	`5415`	`[`
Original file line number	Diff line number	Diff line change
`@@ -9,28 +9,28 @@ class HelloWorld`
`9`	`9`	`public function parseUrl(string $url): string`
`10`	`10`	`{`
`11`	`11`	`$parsedUrl = parse_url(urldecode($url));`
`12`		`- assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
	`12`	`+ assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
`13`	`13`
`14`	`14`	`if (array_key_exists('host', $parsedUrl)) {`
`15`		`- assertType('array{scheme?: string, host: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);`
	`15`	`+ assertType('array{scheme?: string, host: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);`
`16`	`16`	`throw new \RuntimeException('Absolute URLs are prohibited for the redirectTo parameter.');`
`17`	`17`	`}`
`18`	`18`
`19`		`- assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
	`19`	`+ assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
`20`	`20`
`21`	`21`	`$redirectUrl = $parsedUrl['path'];`
`22`	`22`
`23`	`23`	`if (array_key_exists('query', $parsedUrl)) {`
`24`		`- assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);`
	`24`	`+ assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);`
`25`	`25`	`$redirectUrl .= '?' . $parsedUrl['query'];`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (array_key_exists('fragment', $parsedUrl)) {`
`29`		`- assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);`
	`29`	`+ assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);`
`30`	`30`	`$redirectUrl .= '#' . $parsedUrl['query'];`
`31`	`31`	`}`
`32`	`32`
`33`		`- assertType('array{scheme?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
	`33`	`+ assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $parsedUrl);`
`34`	`34`
`35`	`35`	`return $redirectUrl;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,18 @@ public function createRedirectRequest(string $redirectUri): ?string`
`11`	`11`	`{`
`12`	`12`	`$redirectUrlParts = parse_url($redirectUri);`
`13`	`13`	`if (false === is_array($redirectUrlParts) \|\| true === array_key_exists('host', $redirectUrlParts)) {`
`14`		`- assertType('array{scheme?: string, host: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $redirectUrlParts);`
	`14`	`+ assertType('array{scheme?: string, host: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}\|false', $redirectUrlParts);`
`15`	`15`	`return null;`
`16`	`16`	`}`
`17`	`17`
`18`		`- assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);`
	`18`	`+ assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);`
`19`	`19`
`20`	`20`	`if (true === array_key_exists('query', $redirectUrlParts)) {`
`21`		`- assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $redirectUrlParts);`
	`21`	`+ assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $redirectUrlParts);`
`22`	`22`	`$redirectServer['QUERY_STRING'] = $redirectUrlParts['query'];`
`23`	`23`	`}`
`24`	`24`
`25`		`- assertType('array{scheme?: string, host?: string, port?: int, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);`
	`25`	`+ assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $redirectUrlParts);`
`26`	`26`
`27`	`27`	`return 'foo';`
`28`	`28`	`}`