Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BracesFixer - handle enums #6301

Merged
merged 1 commit into from Feb 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Fixer/Basic/BracesFixer.php
Expand Up @@ -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(
Expand Down
43 changes: 43 additions & 0 deletions tests/Fixer/Basic/BracesFixerTest.php
Expand Up @@ -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' => [
'<?php
enum Foo
{
case Bar;

public function abc()
{
}
}',
'<?php
enum Foo {
case Bar;

public function abc() {
}
}',
];

yield 'backed-enum' => [
'<?php
enum Foo: string
{
case Bar = "bar";
}',
'<?php
enum Foo: string {
case Bar = "bar";}',
];
}
}