Remove deprecated no_short_echo_tag rule

PHP-CS-Fixer · Dec 13, 2019 · 65fa51b · 65fa51b
1 parent 642ea0c
commit 65fa51b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 116 deletions.
diff --git a/README.rst b/README.rst
@@ -1073,11 +1073,6 @@ Choose from the list of available rules:
 
   Short cast ``bool`` using double exclamation mark should not be used.
 
-* **no_short_echo_tag**
-
-  Replaces short-echo ``<?=`` with long format ``<?php echo`` syntax.
-  DEPRECATED: use ``echo_tag_syntax`` instead.
-
 * **no_singleline_whitespace_before_semicolons** [@Symfony, @PhpCsFixer]
 
   Single-line whitespace before closing semicolon are prohibited.

diff --git a/UPGRADE-v3.md b/UPGRADE-v3.md
@@ -26,6 +26,7 @@ Old name | New name | Note
 `lowercase_constants`                           | `constant_case`                               | use configuration `['case' => 'lower']`
 `method_separation`                             | `class_attributes_separation`                 | use configuration `['elements' => ['method']]`
 `no_extra_consecutive_blank_lines`              | `no_extra_blank_lines`                        |
+`no_short_echo_tag`                             | `echo_tag_syntax`                             | use configuration `['format' => 'long']`
 `php_unit_ordered_covers`                       | `phpdoc_order_by_value`                       | use configuration `['annotations' => [ 'covers' ]]`
 `pre_increment`                                 | `increment_style`                             | use configuration `['style' => 'pre']`
 `silenced_deprecation_error`                    | `error_suppression`                           |

diff --git a/src/Fixer/Alias/NoMixedEchoPrintFixer.php b/src/Fixer/Alias/NoMixedEchoPrintFixer.php
@@ -73,7 +73,7 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        // should run after NoShortEchoTagFixer / EchoTagSyntaxFixer.
+        // should run after EchoTagSyntaxFixer.
         return -10;
     }
 

diff --git a/src/Fixer/PhpTag/NoShortEchoTagFixer.php b/src/Fixer/PhpTag/NoShortEchoTagFixer.php
diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
@@ -143,7 +143,6 @@ public function provideFixersPriorityCases()
             [$fixers['native_function_invocation'], $fixers['global_namespace_import']],
             [$fixers['no_php4_constructor'], $fixers['ordered_class_elements']],
             [$fixers['no_short_bool_cast'], $fixers['cast_spaces']],
-            [$fixers['no_short_echo_tag'], $fixers['no_mixed_echo_print']],
             [$fixers['no_spaces_after_function_name'], $fixers['function_to_constant']],
             [$fixers['no_spaces_inside_parenthesis'], $fixers['function_to_constant']],
             [$fixers['no_superfluous_phpdoc_tags'], $fixers['no_empty_phpdoc']],

diff --git a/tests/Fixer/PhpTag/NoShortEchoTagFixerTest.php b/tests/Fixer/PhpTag/NoShortEchoTagFixerTest.php
diff --git a/tests/Fixtures/Integration/priority/no_mixed_echo_print,no_short_echo_tag.test b/tests/Fixtures/Integration/priority/no_mixed_echo_print,no_short_echo_tag.test