Skip to content

Support type narrowing with casted parameters #2186

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

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Support type narrowing with casted parameters #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ce1ee
Support type narrowing with casted parameters
staabm Jan 17, 2023
683dcb1
more tests and impl simplified
staabm Jan 17, 2023
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
15 changes: 13 additions & 2 deletions src/Type/Php/CtypeDigitFunctionTypeSpecifyingExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace PHPStan\Type\Php;

use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Expr\FuncCall;
use PHPStan\Analyser\Scope;
use PHPStan\Analyser\SpecifiedTypes;
Expand Down Expand Up @@ -38,7 +39,8 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
throw new ShouldNotHappenException();
}

if ($context->true() && $scope->getType($node->getArgs()[0]->value)->isNumericString()->yes()) {
$exprArg = $node->getArgs()[0]->value;
if ($context->true() && $scope->getType($exprArg)->isNumericString()->yes()) {
return new SpecifiedTypes();
}

Expand All @@ -54,7 +56,16 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
]);
}

return $this->typeSpecifier->create($node->getArgs()[0]->value, TypeCombinator::union(...$types), $context, false, $scope);
$unionType = TypeCombinator::union(...$types);
$specifiedTypes = $this->typeSpecifier->create($exprArg, $unionType, $context, false, $scope);

if ($context->true() && $exprArg instanceof Cast) {
Copy link
Contributor Author

@staabm staabm Jan 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my initial attempt was to do this directly within the TypeSpecifier ... but I then got the feeling that the type narrowing of a cast-expression is not a concept which can be applied to all specifying extensions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, well, is_string((string) $int) is always true, but it doesn't make $int a string :D

$specifiedTypes = $specifiedTypes->unionWith(
$this->typeSpecifier->create($exprArg->expr, $unionType, $context, false, $scope),
);
}

return $specifiedTypes;
}

public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
Expand Down
2 changes: 2 additions & 0 deletions tests/PHPStan/Analyser/NodeScopeResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,8 @@ public function dataFileAsserts(): iterable
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8621.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8084.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3019.php');

yield from $this->gatherAssertTypes(__DIR__ . '/data/callsite-cast-narrowing.php');
}

/**
Expand Down
54 changes: 54 additions & 0 deletions tests/PHPStan/Analyser/data/callsite-cast-narrowing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php

namespace CallsiteCastNarrowing;

use function PHPStan\Testing\assertType;

class HelloWorld
{
public function sayHello($mixed, int $int, string $string): void
{
if (ctype_digit((string) $mixed)) {
assertType('int<48, 57>|int<256, max>|numeric-string', $mixed);
} else {
assertType('mixed', $mixed);
}
assertType('mixed', $mixed);

if (ctype_digit((int) $mixed)) {
assertType('int<48, 57>|int<256, max>|numeric-string', $mixed);
} else {
assertType('mixed', $mixed);
}
assertType('mixed', $mixed);

if (ctype_digit((string) $int)) {
assertType('int', $int);
} else {
assertType('int', $int);
}
assertType('int', $int);

if (ctype_digit((int) $int)) {
assertType('int<48, 57>|int<256, max>', $int);
} else {
assertType('int', $int);
}
assertType('int', $int);

if (ctype_digit((string) $string)) {
assertType('numeric-string', $string);
} else {
assertType('string', $string);
}
assertType('string', $string);

if (ctype_digit((int) $string)) {
assertType('numeric-string', $string);
} else {
assertType('string', $string);
}
assertType('string', $string);
}

}