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

ClassReferenceNameCasingFixer - Fix for double arrow #6279

Merged
merged 1 commit into from Feb 9, 2022
Merged

ClassReferenceNameCasingFixer - Fix for double arrow #6279

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 src/AbstractNoUselessElseFixer.php
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ protected function isSuperfluousElse(Tokens $tokens, int $index): bool
return false;
}

if ($tokens[$candidateIndex]->equals([T_THROW])) {
if ($tokens[$candidateIndex]->isGivenKind(T_THROW)) {
$previousIndex = $tokens->getPrevMeaningfulToken($candidateIndex);

if (!$tokens[$previousIndex]->equalsAny([';', '{'])) {
Expand Down
2 changes: 1 addition & 1 deletion src/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixer.php
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@ private function fixSpacing(int $index, Tokens $tokens): void

if (
$currentToken->equals(',') && !$tokens[$prevIndex]->isComment()
&& (true === $this->configuration['after_heredoc'] || !$tokens[$prevIndex]->equals([T_END_HEREDOC]))
&& (true === $this->configuration['after_heredoc'] || !$tokens[$prevIndex]->isGivenKind(T_END_HEREDOC))
) {
$tokens->removeLeadingWhitespace($i);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Fixer/Casing/ClassReferenceNameCasingFixer.php
View file
Open in desktop
Expand Up @@ -78,6 +78,7 @@ private function getClassReference(Tokens $tokens, NamespaceAnalysis $namespace)
T_CASE, // PHP 8.1 trait enum-case
T_CLASS,
T_CONST,
T_DOUBLE_ARROW,
T_DOUBLE_COLON,
T_FUNCTION,
T_INTERFACE,
Expand Down Expand Up @@ -120,7 +121,7 @@ private function getClassReference(Tokens $tokens, NamespaceAnalysis $namespace)
continue;
}

if (!$tokens[$prevIndex]->isGivenKind([T_NEW]) && $tokens[$nextIndex]->equals('(')) {
if (!$tokens[$prevIndex]->isGivenKind(T_NEW) && $tokens[$nextIndex]->equals('(')) {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Fixer/ControlStructure/NoBreakCommentFixer.php
View file
Open in desktop
Expand Up @@ -154,7 +154,7 @@ private function fixCase(Tokens $tokens, int $casePosition): void
continue;
}

if ($tokens[$i]->isGivenKind([T_THROW])) {
if ($tokens[$i]->isGivenKind(T_THROW)) {
$previousIndex = $tokens->getPrevMeaningfulToken($i);

if ($previousIndex === $casePosition || $tokens[$previousIndex]->equalsAny(['{', ';', '}', [T_OPEN_TAG]])) {
Expand Down
2 changes: 1 addition & 1 deletion src/Fixer/Import/SingleImportPerStatementFixer.php
View file
Open in desktop
Expand Up @@ -130,7 +130,7 @@ private function getGroupStatements(Tokens $tokens, string $groupPrefix, int $gr
for ($i = $groupOpenIndex + 1; $i <= $groupCloseIndex; ++$i) {
$token = $tokens[$i];

if ($token->equals(',') && $tokens[$tokens->getNextMeaningfulToken($i)]->equals([CT::T_GROUP_IMPORT_BRACE_CLOSE])) {
if ($token->equals(',') && $tokens[$tokens->getNextMeaningfulToken($i)]->isGivenKind(CT::T_GROUP_IMPORT_BRACE_CLOSE)) {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixer.php
View file
Open in desktop
Expand Up @@ -169,7 +169,7 @@ protected function applyPhpUnitClassFix(Tokens $tokens, int $startIndex, int $en
$expectedTypeTokenIndex = $tokens->getNextMeaningfulToken($bracketTokenIndex);
$expectedTypeToken = $tokens[$expectedTypeTokenIndex];

if (!$expectedTypeToken->equals([T_CONSTANT_ENCAPSED_STRING])) {
if (!$expectedTypeToken->isGivenKind(T_CONSTANT_ENCAPSED_STRING)) {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Tokenizer/AbstractTypeTransformer.php
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ protected function doProcess(Tokens $tokens, int $index, $originalToken): void

$prevPrevTokenIndex = $tokens->getPrevMeaningfulToken($prevIndex);

if ($tokens[$prevPrevTokenIndex]->isGivenKind([T_CATCH])) {
if ($tokens[$prevPrevTokenIndex]->isGivenKind(T_CATCH)) {
$this->replaceToken($tokens, $index);

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Tokenizer/Transformer/BraceClassInstantiationTransformer.php
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ public function getRequiredPhpVersionId(): int
*/
public function process(Tokens $tokens, Token $token, int $index): void
{
if (!$tokens[$index]->equals('(') || !$tokens[$tokens->getNextMeaningfulToken($index)]->equals([T_NEW])) {
if (!$tokens[$index]->equals('(') || !$tokens[$tokens->getNextMeaningfulToken($index)]->isGivenKind(T_NEW)) {
return;
}

Expand Down
21 changes: 21 additions & 0 deletions tests/Fixer/Casing/ClassReferenceNameCasingFixerTest.php
View file
Open in desktop
Expand Up @@ -137,6 +137,10 @@ public function provideFixCases(): \Generator
'<?php class Foo { use exception; }',
];

yield [
'<?php $foo = ["const" => exception];',
SpacePossum marked this conversation as resolved.
Show resolved Hide resolved
];

yield [
'<?php
namespace {
Expand Down Expand Up @@ -181,6 +185,23 @@ public function provideFixCases(): \Generator
'<?php try { foo(); } catch(\LogicException $e) {}',
'<?php try { foo(); } catch(\logicexception $e) {}',
];

yield [
'<?php
Closure::bind(fn () => null, null, new class {});
\Closure::bind(fn () => null, null, new class {});

Foo\Bar::bind(fn () => null, null, new class {});
\A\B\\Bar::bind(fn () => null, null, new class {});
',
'<?php
CLOSURE::bind(fn () => null, null, new class {});
\CLOSURE::bind(fn () => null, null, new class {});

Foo\Bar::bind(fn () => null, null, new class {});
\A\B\\Bar::bind(fn () => null, null, new class {});
',
];
}

/**
Expand Down