feat: PhpdocTypesOrderFixer Support DNF types (#7732)

Co-authored-by: Greg Korba <greg@codito.dev>
PHP-CS-Fixer · Jan 16, 2024 · 1d34bb2 · 1d34bb2
1 parent 7144d50
commit 1d34bb2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php b/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php
@@ -169,7 +169,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
      */
     private function sortTypes(TypeExpression $typeExpression): array
     {
-        $normalizeType = static fn (string $type): string => Preg::replace('/^\\??\\\?/', '', $type);
+        $normalizeType = static fn (string $type): string => Preg::replace('/^\(*\??\\\?/', '', $type);
 
         $typeExpression->sortTypes(
             function (TypeExpression $a, TypeExpression $b) use ($normalizeType): int {

diff --git a/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php
@@ -522,6 +522,36 @@ public static function provideFixWithAlphaAlgorithmCases(): iterable
             '<?php /** @return A&B<X|Y|Z>&C&D */',
             '<?php /** @return A&D&B<X|Y|Z>&C */',
         ];
+
+        yield [
+            '<?php /** @param A|(B&C) */',
+            '<?php /** @param (C&B)|A */',
+        ];
+
+        yield [
+            '<?php /** @param A|((A&B)|(B&C)) */',
+            '<?php /** @param ((B&C)|(B&A))|A */',
+        ];
+
+        yield [
+            '<?php /** @param A&(B&C) */',
+            '<?php /** @param (C&B)&A */',
+        ];
+
+        yield [
+            '<?php /** @param (A&C)|(B&C)|(C&D) */',
+            '<?php /** @param (C&A)|(C&B)|(C&D) */',
+        ];
+
+        yield [
+            '<?php /** @param \A|(\B&\C)|D */',
+            '<?php /** @param D|\A|(\C&\B) */',
+        ];
+
+        yield [
+            '<?php /** @param A|((B&C)|D) */',
+            '<?php /** @param (D|(C&B))|A */',
+        ];
     }
 
     /**