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

Update ConstantArrayType::accepts() for lists #3381

Closed
wants to merge 3 commits into from
Closed

Update ConstantArrayType::accepts() for lists #3381

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
13b6747
A list should only accept lists
VincentLanglet Sep 19, 2024
70f4d02
Fix SA
VincentLanglet Sep 19, 2024
102b53b
Review
VincentLanglet Sep 22, 2024
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
11 changes: 10 additions & 1 deletion src/Type/Constant/ConstantArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,16 @@ public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
return AcceptsResult::createFromBoolean(count($type->keyTypes) === 0);
}

$result = AcceptsResult::createYes();
if ($this->isList()->yes() && $type->isList()->no()) {
return AcceptsResult::createNo();
Copy link
Member

Choose a reason for hiding this comment

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

What about $type->isList()->maybe()? I think that at that point the $result below should be assigned to createMaybe() and not createYes()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added 102b53b

but what about the following issue #3381 (comment) ?

Copy link
Member

Choose a reason for hiding this comment

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

I don't really know what to do about that. Maybe this whole change is a hack and we need to approach it differently.

Copy link
Contributor Author

@VincentLanglet VincentLanglet Sep 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think your right and this things is a hack, or at least not the right fix because it's not really related to list.

PHPStan sometimes consider an array is ordered and sometimes not.

An easy reproducer is https://phpstan.org/r/1ffe9cb5-65b1-4a7c-9010-3aa24560b462 vs real world example https://3v4l.org/TqTBn

Maybe ConstantArray::getKeysOrValuesArray is wrong... or a ordered-array (or unordered-array) need to be introduced...

At least this PR helped to find some others bugs.

}

if ($this->isList()->yes() && $type->isList()->maybe()) {
$result = AcceptsResult::createMaybe();
} else {
$result = AcceptsResult::createYes();
}

foreach ($this->keyTypes as $i => $keyType) {
$valueType = $this->valueTypes[$i];
$hasOffsetValueType = $type->hasOffsetValueType($keyType);
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ static function (array $i): array {
unset($i[2]);
}

return $i;
return array_values($i);
},
self::getLooseComparisonAgainsEnumsIssues(),
);
Expand Down
1 change: 0 additions & 1 deletion tests/PHPStan/Rules/Generators/YieldFromTypeRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public function testRule(): void
[
'Generator expects value type array{DateTime, DateTime, stdClass, DateTimeImmutable}, array{0: DateTime, 1: DateTime, 2: stdClass, 4: DateTimeImmutable} given.',
74,
'Array does not have offset 3.',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since it's decided by the early return about list we don't have the information anymore.

  • Not sure if it's an ok loss or we need to keep this (and how)
  • Not sure if we need an help "This must be a list"

Your call.

],
[
'Result of yield from (void) is used.',
Expand Down
11 changes: 11 additions & 0 deletions tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,4 +841,15 @@ public function testClosureBind(): void
]);
}

public function testBug11600(): void
{
$this->checkThisOnly = false;
$this->analyse([__DIR__ . '/data/bug-11600.php'], [
[
'Parameter #1 $array of static method Bug10600\HelloWorld::sayHello() expects array{1, 2}, array{1: 2, 0: 1} given.',
18,
],
]);
}

}
18 changes: 18 additions & 0 deletions tests/PHPStan/Rules/Methods/data/bug-11600.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

namespace Bug10600;

class HelloWorld
{
/** @param array{1, 2} $array */
public static function sayHello(array $array): void
{
array_values($array)[0];
}
}

$a = [0 => 1, 1 => 2];
$b = [1 => 2, 0 => 1];

HelloWorld::sayHello($a);
HelloWorld::sayHello($b);
Loading