Skip to content

Revert "non-falsy-string cannot be converted to 0" #3997

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 4 commits into from
Jul 17, 2025
Merged

Revert "non-falsy-string cannot be converted to 0" #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3427699
Revert "non-falsy-string cannot be converted to 0"
VincentLanglet May 16, 2025
d9dc7b1
Fix
VincentLanglet May 16, 2025
080836b
Add comment
VincentLanglet May 16, 2025
8246e6d
Fix
VincentLanglet May 16, 2025
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
3 changes: 2 additions & 1 deletion src/Type/Accessory/AccessoryNonFalsyStringType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public function toAbsoluteNumber(): Type

public function toInteger(): Type
{
return TypeCombinator::remove(new IntegerType(), new ConstantIntegerType(0));
// Do not remove `0` since `(int) '00'` is still `0`.
return new IntegerType();
}

public function toFloat(): Type
Expand Down
12 changes: 6 additions & 6 deletions tests/PHPStan/Analyser/nsrt/bug-10893.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
function hasMicroseconds(\DateTimeInterface $value, string $str): bool
{
assertType('non-falsy-string&numeric-string', $str);
assertType('int<min, -1>|int<1, max>', (int)$str);
assertType('true', (int)$str !== 0);
assertType('int', (int)$str);
assertType('bool', (int)$str !== 0);

assertType('non-falsy-string&numeric-string', $value->format('u'));
assertType('int<min, -1>|int<1, max>', (int)$value->format('u'));
assertType('true', (int)$value->format('u') !== 0);
assertType('int', (int)$value->format('u'));
assertType('bool', (int)$value->format('u') !== 0);

assertType('non-falsy-string&numeric-string', $value->format('v'));
assertType('int<min, -1>|int<1, max>', (int)$value->format('v'));
assertType('true', (int)$value->format('v') !== 0);
assertType('int', (int)$value->format('v'));
assertType('bool', (int)$value->format('v') !== 0);

assertType('float', $value->format('u') * 1e-6);
assertType('float', $value->format('v') * 1e-3);
Expand Down
3 changes: 1 addition & 2 deletions tests/PHPStan/Analyser/nsrt/bug-12393b.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function doStrings($nonEmpty, $nonFalsy, $numeric, $literal, $lower, $upper) {
$this->foo = $nonEmpty;
assertType('int', $this->foo);
$this->foo = $nonFalsy;
assertType('int<min, -1>|int<1, max>', $this->foo);
assertType('int', $this->foo);
$this->foo = $numeric;
assertType('int', $this->foo);
$this->foo = $literal;
Expand Down Expand Up @@ -706,4 +706,3 @@ public function __toString(): string {
return 'Foo';
}
}

2 changes: 1 addition & 1 deletion tests/PHPStan/Analyser/nsrt/non-falsy-string.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Foo {
* @param truthy-string $truthyString
*/
public function bar($nonFalseyString, $truthyString) {
assertType('int<min, -1>|int<1, max>', (int) $nonFalseyString);
assertType('int', (int) $nonFalseyString); // Do not remove `0` since `(int) '00'` is still `0`
// truthy-string is an alias for non-falsy-string
assertType('non-falsy-string', $truthyString);
}
Expand Down
Loading