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

Fix parse_url() return type #7293

Merged
merged 3 commits into from Jan 4, 2022
Merged

Fix parse_url() return type #7293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fa6b61
Fix parse_url() return type
villfa Jan 4, 2022
2f3af4a
Remove unused import
villfa Jan 4, 2022
c42f3d5
Fix typo
villfa Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 19 additions & 13 deletions src/Psalm/Internal/Provider/ReturnTypeProvider/ParseUrlReturnTypeProvider.php
View file
Open in desktop
Expand Up @@ -15,8 +15,6 @@
use Psalm\Type\Atomic\TString;
use Psalm\Type\Union;

use function count;

use const PHP_URL_FRAGMENT;
use const PHP_URL_HOST;
use const PHP_URL_PASS;
Expand Down Expand Up @@ -44,7 +42,8 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
return Type::getMixed();
}

if (count($call_args) > 1) {
if (isset($call_args[1])) {
$is_default_component = false;
if ($component_type = $statements_source->node_data->getType($call_args[1]->value)) {
if (!$component_type->hasMixed()) {
$codebase = $statements_source->getCodebase();
Expand Down Expand Up @@ -110,22 +109,29 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev

return $nullable_falsable_int;
}

if ($component_type->isSingleIntLiteral()) {
$component_type_type = $component_type->getSingleIntLiteral();
$is_default_component = $component_type_type->value <= -1;
}
}
}

$nullable_string_or_int = new Union([
new TString,
new TInt,
new TNull,
]);
if (!$is_default_component) {
$nullable_string_or_int = new Union([
new TString,
new TInt,
new TNull,
]);

$codebase = $statements_source->getCodebase();
$codebase = $statements_source->getCodebase();

if ($codebase->config->ignore_internal_nullable_issues) {
$nullable_string_or_int->ignore_nullable_issues = true;
}
if ($codebase->config->ignore_internal_nullable_issues) {
$nullable_string_or_int->ignore_nullable_issues = true;
}

return $nullable_string_or_int;
return $nullable_string_or_int;
}
}

$component_types = [
Expand Down
13 changes: 13 additions & 0 deletions tests/FunctionCallTest.php
View file
Open in desktop
Expand Up @@ -673,6 +673,19 @@ function bag(string $s) : string {
'$fragment' => 'false|null|string',
],
],
'parseUrlDefaultComponent' => [
'<?php
$component = -1;
$url = "foo";
$a = parse_url($url, -1);
$b = parse_url($url, -42);
$c = parse_url($url, $component);',
'assertions' => [
'$a' => 'array{fragment?: string, host?: string, pass?: string, path?: string, port?: int, query?: string, scheme?: string, user?: string}|false',
'$b' => 'array{fragment?: string, host?: string, pass?: string, path?: string, port?: int, query?: string, scheme?: string, user?: string}|false',
'$c' => 'array{fragment?: string, host?: string, pass?: string, path?: string, port?: int, query?: string, scheme?: string, user?: string}|false',
],
],
'triggerUserError' => [
'<?php
function mightLeave() : string {
Expand Down