fix: TernaryOperatorSpacesFixer - handle instanceof static
#8879
Conversation
This file contains hidden or 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
NullableTypeDeclarationFixer - handle instanceof staticNullableTypeTransformer - handle instanceof static
NullableTypeTransformer - handle instanceof staticNullableTypeTransformer - handle instanceof static
NullableTypeTransformer - handle instanceof staticTernaryOperatorSpacesFixer - handle instanceof static
kubawerlos
reviewed
Jul 22, 2025
|
|
||
| if ( | ||
| $tokens[$prevIndex]->isGivenKind(\T_STATIC) | ||
| && $tokens[$tokens->getPrevMeaningfulToken($prevIndex)]->isGivenKind(\T_INSTANCEOF) |
There was a problem hiding this comment.
Any case that justifies this line (with T_INSTANCEOF?
If not, I'd say let's add T_STATIC to self::TYPES.
There was a problem hiding this comment.
T_STATIC is already part of self::TYPES, but it needs extra handling because in the sequence static ? the ? is not always the "nullable type".
There was a problem hiding this comment.
So at the moment the ? token in $a instanceof static ? $b : $c is wrongly transformed into CT::T_NULLABLE_TYPE. This is fixed here.
gharlan
commented
Jul 22, 2025
| @@ -82,6 +82,11 @@ function A(){} | |||
| echo $guard?1:2;}', | |||
| ]; | |||
|
|
|||
| yield 'handle instanceof static' => [ | |||
| '<?php $a instanceof static ? $b : $c;', | |||
| '<?php $a instanceof static?$b:$c;', | |||
There was a problem hiding this comment.
this wasn't fixed before.
| @@ -41,6 +41,10 @@ public function testFix(string $expected, ?string $input = null): void | |||
| */ | |||
| public static function provideFixCases(): iterable | |||
| { | |||
| yield [ | |||
| '<?php $a instanceof static ? \DateTime::class : $c;', | |||
There was a problem hiding this comment.
this was wrongly changed to:
<?php $a instanceof static ?\DateTime::class : $c;
kubawerlos
approved these changes
Jul 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.