From 61a5df72523e19e99fab454637f5106fdb344c25 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Sun, 20 Feb 2022 13:07:33 +0100 Subject: [PATCH] BracesFixer - handle enums --- src/Fixer/Basic/BracesFixer.php | 2 +- tests/Fixer/Basic/BracesFixerTest.php | 43 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/Fixer/Basic/BracesFixer.php b/src/Fixer/Basic/BracesFixer.php index 5b873664b38..f0dd9824caa 100644 --- a/src/Fixer/Basic/BracesFixer.php +++ b/src/Fixer/Basic/BracesFixer.php @@ -297,7 +297,7 @@ private function fixDoWhile(Tokens $tokens): void private function fixIndents(Tokens $tokens): void { - $classyTokens = [T_CLASS, T_TRAIT, T_INTERFACE]; // FIXME use Token::getClassyTokenKinds() when ENUM tests are made + $classyTokens = Token::getClassyTokenKinds(); $classyAndFunctionTokens = array_merge([T_FUNCTION], $classyTokens); $controlTokens = $this->getControlTokens(); $indentTokens = array_filter( diff --git a/tests/Fixer/Basic/BracesFixerTest.php b/tests/Fixer/Basic/BracesFixerTest.php index 110e7265e68..9edb10ab7e8 100644 --- a/tests/Fixer/Basic/BracesFixerTest.php +++ b/tests/Fixer/Basic/BracesFixerTest.php @@ -5428,4 +5428,47 @@ public function provideFix80Cases() };', ]; } + + /** + * @requires PHP 8.1 + * + * @dataProvider provideFix81Cases + */ + public function testFix81(string $expected, string $input): void + { + $this->doTest($expected, $input); + } + + public function provideFix81Cases() + { + yield 'enum' => [ + ' [ + '