-
-
Notifications
You must be signed in to change notification settings - Fork 336
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.
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
[TypeDeclaration] Handle infinite loop on array_reverse with index on AddMethodCallBasedStrictParamTypeRector on php8+ feature #3678
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7fe1824
[TypeDeclaration] Handle infinite loop on array_reverse with index
samsonasik 28c68c7
[ci-review] Rector Rectify
actions-user d01432b
add fixture for php7.4 as well
samsonasik c86aba4
fix namespace
samsonasik e6c95c1
[ci-review] Rector Rectify
actions-user 42bcdaa
Fix
samsonasik c2618ae
[ci-review] Rector Rectify
actions-user File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
packages/PHPStanStaticTypeMapper/TypeMapper/IntegerRangeTypeMapper.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Rector\PHPStanStaticTypeMapper\TypeMapper; | ||
|
||
use PhpParser\Node; | ||
use PhpParser\Node\Identifier; | ||
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; | ||
use PHPStan\PhpDocParser\Ast\Type\TypeNode; | ||
use PHPStan\Type\IntegerRangeType; | ||
use PHPStan\Type\Type; | ||
use Rector\Core\Php\PhpVersionProvider; | ||
use Rector\Core\ValueObject\PhpVersionFeature; | ||
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; | ||
|
||
/** | ||
* @implements TypeMapperInterface<IntegerRangeType> | ||
*/ | ||
final class IntegerRangeTypeMapper implements TypeMapperInterface | ||
{ | ||
public function __construct( | ||
private readonly PhpVersionProvider $phpVersionProvider | ||
) { | ||
} | ||
|
||
/** | ||
* @return class-string<Type> | ||
*/ | ||
public function getNodeClass(): string | ||
{ | ||
return IntegerRangeType::class; | ||
} | ||
|
||
/** | ||
* @param IntegerRangeType $type | ||
*/ | ||
public function mapToPHPStanPhpDocTypeNode(Type $type, string $typeKind): TypeNode | ||
{ | ||
return new IdentifierTypeNode('int'); | ||
} | ||
|
||
/** | ||
* @param IntegerRangeType $type | ||
*/ | ||
public function mapToPhpParserNode(Type $type, string $typeKind): ?Node | ||
{ | ||
if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { | ||
return null; | ||
} | ||
|
||
if ($type->getMin() === null) { | ||
return null; | ||
} | ||
|
||
if ($type->getMax() === null) { | ||
return null; | ||
} | ||
|
||
return new Identifier('int'); | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
...thod/AddMethodCallBasedStrictParamTypeRector/Fixture/skip_no_return_array_reverse.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Fixture; | ||
|
||
final class SkipNoReturnArrayReverse | ||
{ | ||
public function run() | ||
{ | ||
$parts = array_reverse(explode('/', '/some/test/url')); | ||
foreach ($parts as $index => $uri) { | ||
if ($index === 0) { | ||
continue; | ||
} | ||
|
||
$this->someOtherMethod($index, $uri); | ||
} | ||
} | ||
|
||
private function someOtherMethod(int $index, string $uri) | ||
{ | ||
return sprintf('%d-%s', $index, $uri); | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
...AddMethodCallBasedStrictParamTypeRector/FixtureUnion/skip_no_return_array_reverse.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?php | ||
|
||
namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\FixtureUnion; | ||
|
||
final class SkipNoReturnArrayReverse | ||
{ | ||
public function run() | ||
{ | ||
$parts = array_reverse(explode('/', '/some/test/url')); | ||
foreach ($parts as $index => $uri) { | ||
if ($index === 0) { | ||
continue; | ||
} | ||
|
||
$this->someOtherMethod($index, $uri); | ||
} | ||
} | ||
|
||
private function someOtherMethod(int $index, string $uri) | ||
{ | ||
return sprintf('%d-%s', $index, $uri); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
min, max value null seems valid value https://phpstan.org/r/765b0694-8832-4b65-98b7-4944d2914bc3
getMin()
=== null printed asmin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all type applied with string type seems also valid https://phpstan.org/r/474c8c8b-1d17-4ba2-b6bf-c243b7390e19 for this type:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue seems somehow used index as integer on this type:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I got it, it seems due to combination of
UnionType
+MixedType
, then it should be skipped, see 42bcdaa#diff-42a5a059b66868f3ede960ea9a50a3591de610668457d76063ac2f6dc653dcc3