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 time_nanosleep return type signature #1787

Merged
merged 1 commit into from Oct 3, 2022
Merged

fix time_nanosleep return type signature #1787

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/functionMap.php
View file
Open in desktop
Expand Up @@ -12308,7 +12308,7 @@
'tidyNode::isPhp' => ['bool'],
'tidyNode::isText' => ['bool'],
'time' => ['positive-int'],
'time_nanosleep' => ['array{0:0|positive-int,1:0|positive-int}|bool', 'seconds'=>'int', 'nanoseconds'=>'int'],
'time_nanosleep' => ['array{seconds:0|positive-int,nanoseconds:0|positive-int}|bool', 'seconds'=>'int', 'nanoseconds'=>'int'],
Copy link
Contributor

Choose a reason for hiding this comment

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

would an int-range int<0, max> be better than unioning a constant int and positive-int?

Copy link
Contributor Author

@staabm staabm Oct 3, 2022 •
edited

Choose a reason for hiding this comment

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

I don't think any of the two is "better" - they are equivalent.

Copy link
Contributor

Choose a reason for hiding this comment

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

isn't a single IntegerRangeType preferable to a UnionType containing two different types with regards to performance?
semantically they are they same i agree, but will phpstan simplify it to reduce the php object count from 3 to 1 ?

Copy link
Contributor

Choose a reason for hiding this comment

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

0|positive-int will be normalized to int<0, max> so in that sense they're equivalent

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if you find a example in which we find a measurable difference we should have a closer look.
as we don't have one, I would assume its a micro difference

Copy link
Contributor

Choose a reason for hiding this comment

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

@rvanvelzen thank you, i'm still learning lots about phpstan's type system so forgive any silly questions i may have!

'time_sleep_until' => ['bool', 'timestamp'=>'float'],
'timezone_abbreviations_list' => ['array'],
'timezone_identifiers_list' => ['array<int, string>', 'what='=>'int', 'country='=>'?string'],
Expand Down
5 changes: 5 additions & 0 deletions tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php
View file
Open in desktop
Expand Up @@ -533,4 +533,9 @@ public function testBug7954(): void
$this->analyse([__DIR__ . '/data/bug-7954.php'], []);
}

public function testBug8097(): void
{
$this->analyse([__DIR__ . '/data/bug-8097.php'], []);
}

}
11 changes: 11 additions & 0 deletions tests/PHPStan/Rules/Arrays/data/bug-8097.php
View file
Open in desktop
@@ -0,0 +1,11 @@
<?php

namespace Bug8097;

function snooze($seconds)
{
$t = time_nanosleep($seconds, 0);
while (is_array($t)) {
$t = time_nanosleep($t['seconds'], $t['nanoseconds']);
}
}