Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Type/Php/ParseUrlFunctionDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -143,7 +143,7 @@ private function cacheReturnTypes(): void
$this->componentTypesPairedStrings = [
'scheme' => $string,
'host' => $string,
'port' => $integer,
'port' => $port,
'user' => $string,
'pass' => $string,
'path' => $string,
Expand Down
6 changes: 3 additions & 3 deletions tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
[
Expand All @@ -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',
],
[
Expand Down
12 changes: 6 additions & 6 deletions tests/PHPStan/Analyser/data/bug-2001.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions tests/PHPStan/Analyser/data/bug-3009.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down