DX: Add tests for type colon in backed enums (#6497)

Add tests for backed enum types
PHP-CS-Fixer · Jul 21, 2022 · f408220 · f408220
1 parent 277c55a
commit f408220
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 5 deletions.
diff --git a/doc/list.rst b/doc/list.rst
@@ -2603,7 +2603,7 @@ List of Available Rules
    `Source PhpCsFixer\\Fixer\\ReturnNotation\\ReturnAssignmentFixer <./../src/Fixer/ReturnNotation/ReturnAssignmentFixer.php>`_
 -  `return_type_declaration <./rules/function_notation/return_type_declaration.rst>`_
 
-   There should be one or no space before colon, and one space after it in return type declarations, according to configuration.
+   Adjust spacing around colon in return type declarations and backed enum types.
 
    Rule is applied only in a PHP 7+ environment.
 

diff --git a/doc/rules/function_notation/return_type_declaration.rst b/doc/rules/function_notation/return_type_declaration.rst
@@ -2,8 +2,7 @@
 Rule ``return_type_declaration``
 ================================
 
-There should be one or no space before colon, and one space after it in return
-type declarations, according to configuration.
+Adjust spacing around colon in return type declarations and backed enum types.
 
 Description
 -----------

diff --git a/doc/rules/index.rst b/doc/rules/index.rst
@@ -375,7 +375,7 @@ Function Notation
   Callables must be called without using ``call_user_func*`` when possible.
 - `return_type_declaration <./function_notation/return_type_declaration.rst>`_
 
-  There should be one or no space before colon, and one space after it in return type declarations, according to configuration.
+  Adjust spacing around colon in return type declarations and backed enum types.
 - `single_line_throw <./function_notation/single_line_throw.rst>`_
 
   Throwing exception must be done in single line.

diff --git a/src/Fixer/FunctionNotation/ReturnTypeDeclarationFixer.php b/src/Fixer/FunctionNotation/ReturnTypeDeclarationFixer.php
@@ -37,7 +37,7 @@ final class ReturnTypeDeclarationFixer extends AbstractFixer implements Configur
     public function getDefinition(): FixerDefinitionInterface
     {
         return new FixerDefinition(
-            'There should be one or no space before colon, and one space after it in return type declarations, according to configuration.',
+            'Adjust spacing around colon in return type declarations and backed enum types.',
             [
                 new CodeSample(
                     "<?php\nfunction foo(int \$a):string {};\n"

diff --git a/tests/Fixer/FunctionNotation/ReturnTypeDeclarationFixerTest.php b/tests/Fixer/FunctionNotation/ReturnTypeDeclarationFixerTest.php
@@ -172,4 +172,21 @@ public function provideFix80Cases(): iterable
             '<?php class A { public function foo()   :static{}}',
         ];
     }
+
+    /**
+     * @dataProvider provideFix81Cases
+     * @requires PHP 8.1
+     */
+    public function testFix81(string $expected, string $input): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFix81Cases(): iterable
+    {
+        yield [
+            '<?php enum Foo: int {}',
+            '<?php enum Foo   :   int {}',
+        ];
+    }
 }
diff --git a/tests/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixerTest.php b/tests/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixerTest.php
@@ -3235,4 +3235,32 @@ public function provideTypeColonCases(): iterable
             '<?php $a=1; $f = fn ():      array => [];',
         ];
     }
+
+    /**
+     * @dataProvider provideEnumTypeColonCases
+     * @requires PHP 8.1
+     */
+    public function testEnumTypeColon(string $expected, string $input): void
+    {
+        $this->fixer->configure([
+            'constructs' => [
+                'type_colon',
+            ],
+        ]);
+
+        $this->doTest($expected, $input);
+    }
+
+    public function provideEnumTypeColonCases(): iterable
+    {
+        yield [
+            '<?php enum Foo: int {}',
+            "<?php enum Foo:\nint {}",
+        ];
+
+        yield [
+            '<?php enum Foo: string {}',
+            '<?php enum Foo:string {}',
+        ];
+    }
 }