fix: handle unions in phpdoc_types_order

src/DocBlock/Annotation.php

@@ -204,11 +204,11 @@ public function getTypes(): array
      *
      * @param string[] $types
      */
-    public function setTypes(array $types): void
+    public function setTypes(array $types, string $unionType = '|'): void
     {
         $pattern = '/'.preg_quote($this->getTypesContent(), '/').'/';
 
-        $this->lines[0]->setContent(Preg::replace($pattern, implode('|', $types), $this->lines[0]->getContent(), 1));
+        $this->lines[0]->setContent(Preg::replace($pattern, implode($unionType, $types), $this->lines[0]->getContent(), 1));
 
         $this->clearCache();
     }

src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php

@@ -142,7 +142,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 $types = $annotation->getTypes();
 
                 // fix main types
-                $annotation->setTypes($this->sortTypes($types));
+                $annotation->setTypes($this->sortTypes($types), str_contains($annotation->getContent(), '&') ? '&' : '|');
 
                 // fix @method parameters types
                 $line = $doc->getLine($annotation->getStart());

tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php

@@ -159,6 +159,9 @@ public function provideFixCases(): array
             [
                 '<?php /** @return array<int, callable(array<string, null|string> , DateTime): bool> */',
             ],
+            [
+                '<?php /** @return ContainerInterface&SymfonyContainerInterface */',
+            ],
         ];
     }