diff --git a/README.rst b/README.rst index e5537126e14..18f2d6d9492 100644 --- 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 `` '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 index 01752c65996..ec54f1c9246 100644 --- 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 deleted file mode 100644 index da214784536..00000000000 --- a/src/Fixer/PhpTag/NoShortEchoTagFixer.php +++ /dev/null @@ -1,53 +0,0 @@ - - * 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\PhpTag; - -use PhpCsFixer\AbstractProxyFixer; -use PhpCsFixer\Fixer\DeprecatedFixerInterface; -use PhpCsFixer\FixerDefinition\CodeSample; -use PhpCsFixer\FixerDefinition\FixerDefinition; - -/** - * @author Vincent Klaiber - * - * @deprecated proxy to EchoTagSyntaxFixer - */ -final class NoShortEchoTagFixer extends AbstractProxyFixer implements DeprecatedFixerInterface -{ - /** - * {@inheritdoc} - */ - public function getDefinition() - { - return new FixerDefinition( - 'Replaces short-echo `proxyFixers); - } - - /** - * {@inheritdoc} - */ - protected function createProxyFixers() - { - return [new EchoTagSyntaxFixer()]; - } -} diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php index a96b85bd48e..5e23f3638ac 100644 --- 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 deleted file mode 100644 index 21fa94ea210..00000000000 --- a/tests/Fixer/PhpTag/NoShortEchoTagFixerTest.php +++ /dev/null @@ -1,47 +0,0 @@ - - * 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\PhpTag; - -use PhpCsFixer\Tests\Test\AbstractFixerTestCase; - -/** - * @author Vincent Klaiber - * - * @internal - * - * @covers \PhpCsFixer\Fixer\PhpTag\NoShortEchoTagFixer - */ -final class NoShortEchoTagFixerTest extends AbstractFixerTestCase -{ - /** - * @param string $expected - * @param null|string $input - * - * @dataProvider provideFixCases - */ - public function testFix($expected, $input = null) - { - $this->doTest($expected, $input); - } - - public function provideFixCases() - { - return [ - [' PLAIN TEXT', ' PLAIN TEXT'], - ['PLAIN TEXT', 'PLAIN TEXT'], - [' ', ' '], - [' - ---INPUT-- -