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.

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

PhpUnitTestCaseStaticMethodCallsFixer - fix for abstract static method #5433

Merged
merged 1 commit into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,10 @@ private function needsConversion(Tokens $tokens, $index, $referenceIndex, $callT
*/
private function findEndOfNextBlock(Tokens $tokens, $index)
{
$index = $tokens->getNextTokenOfKind($index, ['{']);
$nextIndex = $tokens->getNextTokenOfKind($index, [';', '{']);

return $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
return $tokens[$nextIndex]->equals('{')
? $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $nextIndex)
: $nextIndex;
}
}
14 changes: 14 additions & 0 deletions tests/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,20 @@ public function foo()
EOF
,
],
'do not crash on abstract static function' => [
<<<'EOF'
<?php
abstract class FooTest extends TestCase
{
abstract public static function dataProvider();
}
EOF
,
null,
[
'call_type' => PhpUnitTestCaseStaticMethodCallsFixer::CALL_TYPE_THIS,
],
],
];
}

Expand Down