diff --git a/doc/ruleSets/PHP80MigrationRisky.rst b/doc/ruleSets/PHP80MigrationRisky.rst index 6942647a890..8874297159e 100644 --- a/doc/ruleSets/PHP80MigrationRisky.rst +++ b/doc/ruleSets/PHP80MigrationRisky.rst @@ -8,6 +8,7 @@ Rules ----- - `@PHP74Migration:risky <./PHP74MigrationRisky.rst>`_ +- `get_class_to_class_keyword <./../rules/language_construct/get_class_to_class_keyword.rst>`_ - `no_alias_functions <./../rules/alias/no_alias_functions.rst>`_ config: ``['sets' => ['@all']]`` diff --git a/doc/rules/index.rst b/doc/rules/index.rst index 737ad1edb0b..02d5749aed7 100644 --- a/doc/rules/index.rst +++ b/doc/rules/index.rst @@ -299,6 +299,8 @@ Language Construct Add curly braces to indirect variables to make them clear to understand. Requires PHP >= 7.0. - `function_to_constant <./language_construct/function_to_constant.rst>`_ *(risky)* Replace core functions calls returning constants with the constants. +- `get_class_to_class_keyword <./language_construct/get_class_to_class_keyword.rst>`_ *(risky)* + Replace ``get_class`` calls on object variables with class keyword syntax. - `is_null <./language_construct/is_null.rst>`_ *(risky)* Replaces ``is_null($var)`` expression with ``null === $var``. - `no_unset_on_property <./language_construct/no_unset_on_property.rst>`_ *(risky)* diff --git a/doc/rules/language_construct/get_class_to_class_keyword.rst b/doc/rules/language_construct/get_class_to_class_keyword.rst new file mode 100644 index 00000000000..c9a0674b92c --- /dev/null +++ b/doc/rules/language_construct/get_class_to_class_keyword.rst @@ -0,0 +1,44 @@ +=================================== +Rule ``get_class_to_class_keyword`` +=================================== + +Replace ``get_class`` calls on object variables with class keyword syntax. + +.. warning:: Using this rule is risky. + + Risky if the ``get_class`` function is overridden. + +Examples +-------- + +Example #1 +~~~~~~~~~~ + +.. code-block:: diff + + --- Original + +++ New + `_ rule set will enable the ``get_class_to_class_keyword`` rule. diff --git a/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php b/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php index 621a3b67683..24ef8469aee 100644 --- a/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php +++ b/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php @@ -43,7 +43,7 @@ public function getDefinition(): FixerDefinitionInterface /** * {@inheritdoc} * - * Must run before FunctionToConstantFixer. + * Must run before FunctionToConstantFixer, GetClassToClassKeywordFixer. * Must run after PowToExponentiationFixer. */ public function getPriority(): int diff --git a/src/Fixer/LanguageConstruct/GetClassToClassKeywordFixer.php b/src/Fixer/LanguageConstruct/GetClassToClassKeywordFixer.php new file mode 100644 index 00000000000..5f661df4516 --- /dev/null +++ b/src/Fixer/LanguageConstruct/GetClassToClassKeywordFixer.php @@ -0,0 +1,158 @@ + + * Dariusz Rumiński + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace PhpCsFixer\Fixer\LanguageConstruct; + +use PhpCsFixer\AbstractFixer; +use PhpCsFixer\FixerDefinition\FixerDefinition; +use PhpCsFixer\FixerDefinition\FixerDefinitionInterface; +use PhpCsFixer\FixerDefinition\VersionSpecification; +use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample; +use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer; +use PhpCsFixer\Tokenizer\CT; +use PhpCsFixer\Tokenizer\Token; +use PhpCsFixer\Tokenizer\Tokens; + +/** + * @author John Paul E. Balandan, CPA + */ +final class GetClassToClassKeywordFixer extends AbstractFixer +{ + /** + * {@inheritdoc} + */ + public function getDefinition(): FixerDefinitionInterface + { + return new FixerDefinition( + 'Replace `get_class` calls on object variables with class keyword syntax.', + [ + new VersionSpecificCodeSample( + "= 80000 && $tokens->isAllTokenKindsFound([T_STRING, T_VARIABLE]); + } + + /** + * {@inheritdoc} + */ + public function isRisky(): bool + { + return true; + } + + /** + * {@inheritdoc} + */ + protected function applyFix(\SplFileInfo $file, Tokens $tokens): void + { + for ($index = $tokens->count() - 1; $index > 0; --$index) { + if (!$tokens[$index]->equals([T_STRING, 'get_class'], false)) { + continue; + } + + if (!(new FunctionsAnalyzer())->isGlobalFunctionCall($tokens, $index)) { + continue; + } + + $braceOpenIndex = $tokens->getNextMeaningfulToken($index); + $braceCloseIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $braceOpenIndex); + + if ($braceCloseIndex === $tokens->getNextMeaningfulToken($braceOpenIndex)) { + // get_class with no arguments + continue; + } + + $i = $braceOpenIndex + 1; + $meaningfulTokensCount = 0; + $variableTokens = []; + + for (; $i < $braceCloseIndex; ++$i) { + if (!$tokens[$i]->equalsAny([[T_WHITESPACE], [T_COMMENT], [T_DOC_COMMENT], '(', ')'])) { + ++$meaningfulTokensCount; + } + + if (!$tokens[$i]->isGivenKind(T_VARIABLE)) { + continue; + } + + if ('$this' === strtolower($tokens[$i]->getContent())) { + // get_class($this) + continue 2; + } + + $variableTokens[] = $i; + } + + if ($meaningfulTokensCount > 1 || 1 !== \count($variableTokens)) { + // argument contains more logic, or more arguments, or no variable argument + continue; + } + + $this->fixGetClassCall($tokens, $index, $braceOpenIndex, $braceCloseIndex, current($variableTokens)); + } + } + + private function fixGetClassCall(Tokens $tokens, int $index, int $braceOpenIndex, int $braceCloseIndex, int $variableIndex): void + { + $replacements = [ + new Token([T_VARIABLE, $tokens[$variableIndex]->getContent()]), + new Token([T_DOUBLE_COLON, '::']), + new Token([CT::T_CLASS_CONSTANT, 'class']), + ]; + + for ($i = $braceOpenIndex; $i <= $braceCloseIndex; ++$i) { + if ($tokens[$i]->isGivenKind([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) { + continue; + } + + $tokens->clearTokenAndMergeSurroundingWhitespace($i); + } + + $prevIndex = $tokens->getPrevMeaningfulToken($index); + + if ($tokens[$prevIndex]->isGivenKind(T_NS_SEPARATOR)) { + $tokens->clearAt($prevIndex); + } + + $tokens->clearAt($index); + $tokens->insertSlices([$index => $replacements]); + } +} diff --git a/src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php b/src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php index 79b900434c2..d21f129aa13 100644 --- a/src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php +++ b/src/Fixer/Semicolon/MultilineWhitespaceBeforeSemicolonsFixer.php @@ -76,7 +76,7 @@ function foo () { * {@inheritdoc} * * Must run before SpaceAfterSemicolonFixer. - * Must run after CombineConsecutiveIssetsFixer, NoEmptyStatementFixer, SimplifiedIfReturnFixer, SingleImportPerStatementFixer. + * Must run after CombineConsecutiveIssetsFixer, GetClassToClassKeywordFixer, NoEmptyStatementFixer, SimplifiedIfReturnFixer, SingleImportPerStatementFixer. */ public function getPriority(): int { diff --git a/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php b/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php index 3511d3aad1a..0a17309e397 100644 --- a/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php +++ b/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php @@ -50,7 +50,7 @@ function foo( \$bar, \$baz ) /** * {@inheritdoc} * - * Must run before FunctionToConstantFixer. + * Must run before FunctionToConstantFixer, GetClassToClassKeywordFixer. * Must run after CombineConsecutiveIssetsFixer, CombineNestedDirnameFixer, LambdaNotUsedImportFixer, NoUselessSprintfFixer, PowToExponentiationFixer. */ public function getPriority(): int diff --git a/src/RuleSet/Sets/PHP80MigrationRiskySet.php b/src/RuleSet/Sets/PHP80MigrationRiskySet.php index ab244cd1047..2ef920c0e9b 100644 --- a/src/RuleSet/Sets/PHP80MigrationRiskySet.php +++ b/src/RuleSet/Sets/PHP80MigrationRiskySet.php @@ -25,6 +25,7 @@ public function getRules(): array { return [ '@PHP74Migration:risky' => true, + 'get_class_to_class_keyword' => true, 'no_alias_functions' => [ 'sets' => [ '@all', diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php index aa6406f4462..0dab96ef7e3 100644 --- a/tests/AutoReview/FixerFactoryTest.php +++ b/tests/AutoReview/FixerFactoryTest.php @@ -122,6 +122,7 @@ public function provideFixersPriorityCases() [$fixers['general_phpdoc_annotation_remove'], $fixers['phpdoc_separation']], [$fixers['general_phpdoc_annotation_remove'], $fixers['phpdoc_trim']], [$fixers['general_phpdoc_tag_rename'], $fixers['phpdoc_add_missing_param_annotation']], + [$fixers['get_class_to_class_keyword'], $fixers['multiline_whitespace_before_semicolons']], [$fixers['global_namespace_import'], $fixers['no_unused_imports']], [$fixers['global_namespace_import'], $fixers['ordered_imports']], [$fixers['header_comment'], $fixers['single_line_comment_style']], @@ -172,7 +173,9 @@ public function provideFixersPriorityCases() [$fixers['no_php4_constructor'], $fixers['ordered_class_elements']], [$fixers['no_short_bool_cast'], $fixers['cast_spaces']], [$fixers['no_spaces_after_function_name'], $fixers['function_to_constant']], + [$fixers['no_spaces_after_function_name'], $fixers['get_class_to_class_keyword']], [$fixers['no_spaces_inside_parenthesis'], $fixers['function_to_constant']], + [$fixers['no_spaces_inside_parenthesis'], $fixers['get_class_to_class_keyword']], [$fixers['no_superfluous_elseif'], $fixers['simplified_if_return']], [$fixers['no_superfluous_phpdoc_tags'], $fixers['no_empty_phpdoc']], [$fixers['no_superfluous_phpdoc_tags'], $fixers['void_return']], diff --git a/tests/Fixer/LanguageConstruct/GetClassToClassKeywordFixerTest.php b/tests/Fixer/LanguageConstruct/GetClassToClassKeywordFixerTest.php new file mode 100644 index 00000000000..c695cb41df9 --- /dev/null +++ b/tests/Fixer/LanguageConstruct/GetClassToClassKeywordFixerTest.php @@ -0,0 +1,134 @@ + + * Dariusz Rumiński + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + +namespace PhpCsFixer\Tests\Fixer\LanguageConstruct; + +use PhpCsFixer\Tests\Test\AbstractFixerTestCase; + +/** + * @author John Paul E. Balandan, CPA + * + * @internal + * + * @covers \PhpCsFixer\Fixer\LanguageConstruct\GetClassToClassKeywordFixer + * @requires PHP 8.0 + */ +final class GetClassToClassKeywordFixerTest extends AbstractFixerTestCase +{ + /** + * @dataProvider provideFixCases + */ + public function testFixCases(string $expected, ?string $input = null): void + { + $this->doTest($expected, $input); + } + + public function provideFixCases() + { + yield [ + '