fix: FunctionToConstantFixer should run before `NativeConstantInvoc…

…ationFixer` (PHP-CS-Fixer#7344)
naxvog · Sep 29, 2023 · 4a8cf69 · 4a8cf69
1 parent 2f4d1a3
commit 4a8cf69
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php b/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php
@@ -96,10 +96,11 @@ public function getDefinition(): FixerDefinitionInterface
      * {@inheritdoc}
      *
      * Must run before GlobalNamespaceImportFixer.
+     * Must run after FunctionToConstantFixer.
      */
     public function getPriority(): int
     {
-        return 10;
+        return 1;
     }
 
     public function isCandidate(Tokens $tokens): bool

diff --git a/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php b/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php
@@ -45,7 +45,7 @@ public function getDefinition(): FixerDefinitionInterface
      */
     public function getPriority(): int
     {
-        return 2;
+        return 3;
     }
 
     public function isCandidate(Tokens $tokens): bool

diff --git a/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php b/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php
@@ -38,7 +38,7 @@ public function getDefinition(): FixerDefinitionInterface
      */
     public function getPriority(): int
     {
-        return 3;
+        return 4;
     }
 
     public function isCandidate(Tokens $tokens): bool

diff --git a/src/Fixer/LanguageConstruct/FunctionToConstantFixer.php b/src/Fixer/LanguageConstruct/FunctionToConstantFixer.php
@@ -96,12 +96,12 @@ public function getDefinition(): FixerDefinitionInterface
     /**
      * {@inheritdoc}
      *
-     * Must run before NativeFunctionCasingFixer, NoExtraBlankLinesFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer, SelfStaticAccessorFixer.
+     * Must run before NativeConstantInvocationFixer, NativeFunctionCasingFixer, NoExtraBlankLinesFixer, NoSinglelineWhitespaceBeforeSemicolonsFixer, NoTrailingWhitespaceFixer, NoWhitespaceInBlankLineFixer, SelfStaticAccessorFixer.
      * Must run after NoSpacesAfterFunctionNameFixer, NoSpacesInsideParenthesisFixer, SpacesInsideParenthesesFixer.
      */
     public function getPriority(): int
     {
-        return 1;
+        return 2;
     }
 
     public function isCandidate(Tokens $tokens): bool

diff --git a/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php b/src/Fixer/Whitespace/NoSpacesInsideParenthesisFixer.php
@@ -55,7 +55,7 @@ function foo( \$bar, \$baz )
      */
     public function getPriority(): int
     {
-        return 2;
+        return 3;
     }
 
     public function getSuccessorsNames(): array

diff --git a/src/Fixer/Whitespace/SpacesInsideParenthesesFixer.php b/src/Fixer/Whitespace/SpacesInsideParenthesesFixer.php
@@ -71,7 +71,7 @@ function foo(\$bar, \$baz)
      */
     public function getPriority(): int
     {
-        return 2;
+        return 3;
     }
 
     public function isCandidate(Tokens $tokens): bool

diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
@@ -448,6 +448,7 @@ private static function getFixersPriorityGraph(): array
                 'method_argument_space',
             ],
             'function_to_constant' => [
+                'native_constant_invocation',
                 'native_function_casing',
                 'no_extra_blank_lines',
                 'no_singleline_whitespace_before_semicolons',

diff --git a/tests/Fixtures/Integration/priority/function_to_constant,native_constant_invocation.test b/tests/Fixtures/Integration/priority/function_to_constant,native_constant_invocation.test
@@ -0,0 +1,13 @@
+--TEST--
+Integration of fixers: function_to_constant,native_constant_invocation.
+--RULESET--
+{"function_to_constant": true, "native_constant_invocation": true}
+--EXPECT--
+<?php
+
+echo \M_PI;
+
+--INPUT--
+<?php
+
+echo pi();