From 6478cdcb3b6f4fd5924d137ec0eee49558fdcdea Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Fri, 14 Jan 2022 23:11:35 +0100
Subject: [PATCH 1/2] Add regression test

---
 .../Integration/misc/phpdoc_types_order.test  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/Fixtures/Integration/misc/phpdoc_types_order.test

diff --git a/tests/Fixtures/Integration/misc/phpdoc_types_order.test b/tests/Fixtures/Integration/misc/phpdoc_types_order.test
new file mode 100644
index 00000000000..dafd6b2f2c3
--- /dev/null
+++ b/tests/Fixtures/Integration/misc/phpdoc_types_order.test
@@ -0,0 +1,19 @@
+--TEST--
+Integration of fixer: phpdoc_types_order
+--RULESET--
+{
+    "phpdoc_types_order": {
+        "null_adjustment": "always_last",
+        "sort_algorithm": "alpha"
+    }
+}
+--EXPECT--
+<?php
+
+/** @var Foo & Bar */
+$intersection;
+--INPUT--
+<?php
+
+/** @var Foo & Bar */
+$intersection;

From f8ff91382a27e5d74e7be8f8cecd76f34bc6339a Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Fri, 14 Jan 2022 23:25:05 +0100
Subject: [PATCH 2/2] Replace integration test with a FixerTest

---
 .../Phpdoc/PhpdocTypesOrderFixerTest.php      |  4 ++++
 .../Integration/misc/phpdoc_types_order.test  | 19 -------------------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 tests/Fixtures/Integration/misc/phpdoc_types_order.test

diff --git a/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php
index e295215795f..a225f3b55b9 100644
--- a/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocTypesOrderFixerTest.php
@@ -304,6 +304,10 @@ public function provideFixWithAlphaAlgorithmCases(): array
                 '<?php /** @param Bar|\Foo */',
                 '<?php /** @param \Foo|Bar */',
             ],
+            [
+                '<?php /** @param Bar&\Foo */',
+                '<?php /** @param \Foo&Bar */',
+            ],
             [
                 '<?php /** @property-read \Bar|Foo */',
                 '<?php /** @property-read Foo|\Bar */',
diff --git a/tests/Fixtures/Integration/misc/phpdoc_types_order.test b/tests/Fixtures/Integration/misc/phpdoc_types_order.test
deleted file mode 100644
index dafd6b2f2c3..00000000000
--- a/tests/Fixtures/Integration/misc/phpdoc_types_order.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Integration of fixer: phpdoc_types_order
---RULESET--
-{
-    "phpdoc_types_order": {
-        "null_adjustment": "always_last",
-        "sort_algorithm": "alpha"
-    }
-}
---EXPECT--
-<?php
-
-/** @var Foo & Bar */
-$intersection;
---INPUT--
-<?php
-
-/** @var Foo & Bar */
-$intersection;