From cb35b8fabdb37cb16f20f73fe6c6557f0ba28922 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 19 Jul 2022 13:25:14 +0200
Subject: [PATCH] Upgrade fixtures to PHP 8.1 and reverse patches

---
 Makefile                                      |  14 +-
 tests/expected_report.txt                     |  28 +-
 tests/fixed/ControlStructures.php             |   2 +-
 tests/fixed/EarlyReturn.php                   |   2 +-
 tests/fixed/ExampleBackedEnum.php             |   4 +
 tests/fixed/Exceptions.php                    |   8 +
 tests/fixed/NamingCamelCase.php               |   9 +-
 tests/fixed/PropertyDeclaration.php           |   7 +-
 tests/fixed/TrailingCommaOnFunctions.php      |   7 +-
 tests/fixed/UselessConditions.php             |   2 +-
 tests/fixed/arrow-functions-format.php        |   4 +-
 tests/fixed/example-class.php                 |  15 +-
 tests/fixed/namespaces-spacing.php            |   2 +-
 tests/fixed/new_with_parentheses.php          |   4 +-
 tests/fixed/null_coalesce_equal_operator.php  |  10 +-
 tests/fixed/null_coalesce_operator.php        |   2 +-
 tests/fixed/null_safe_operator.php            |   2 +-
 tests/fixed/return_type_on_closures.php       |  10 +-
 tests/fixed/return_type_on_methods.php        |  10 +-
 tests/fixed/type-hints.php                    |   5 +-
 tests/input/ControlStructures.php             |   2 +-
 tests/input/ExampleBackedEnum.php             |   4 +
 tests/input/Exceptions.php                    |   8 +
 tests/input/PropertyDeclaration.php           |   5 +
 tests/input/TrailingCommaOnFunctions.php      |   7 +-
 tests/input/arrow-functions-format.php        |   4 +-
 tests/input/namespaces-spacing.php            |   2 +-
 ...bility.patch => php72-compatibility.patch} | 410 ++++++-------
 tests/php73-compatibility.patch               | 542 ++++++++++++++---
 tests/php74-compatibility.patch               | 508 +++++++++++-----
 tests/php80-compatibility.patch               | 545 ++----------------
 31 files changed, 1172 insertions(+), 1012 deletions(-)
 rename tests/{php81-compatibility.patch => php72-compatibility.patch} (60%)

diff --git a/Makefile b/Makefile
index c8f4d99e..80eb9081 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,13 @@ test-report: vendor
 test-fix: vendor
 	./bin/test-fix
 
+update-compatibility-patch-72:
+	@git apply tests/php72-compatibility.patch
+	@printf "Please open your editor and apply your changes\n"
+	@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
+	@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php72-compatibility.patch && git apply -R tests/php72-compatibility.patch
+	@git commit -m 'Update compatibility patch' tests/php72-compatibility.patch
+
 update-compatibility-patch-73:
 	@git apply tests/php73-compatibility.patch
 	@printf "Please open your editor and apply your changes\n"
@@ -29,13 +36,6 @@ update-compatibility-patch-80:
 	@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php80-compatibility.patch && git apply -R tests/php80-compatibility.patch
 	@git commit -m 'Update compatibility patch' tests/php80-compatibility.patch
 
-update-compatibility-patch-81:
-	@git apply tests/php81-compatibility.patch
-	@printf "Please open your editor and apply your changes\n"
-	@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
-	@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php81-compatibility.patch && git apply -R tests/php81-compatibility.patch
-	@git commit -m 'Update compatibility patch' tests/php81-compatibility.patch
-
 vendor: composer.json
 	composer update
 	touch -c vendor
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index 53dada55..d53fd480 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -14,23 +14,26 @@ tests/input/constants-var.php                         7       0
 tests/input/ControlStructures.php                     28      0
 tests/input/doc-comment-spacing.php                   11      0
 tests/input/duplicate-assignment-variable.php         1       0
-tests/input/EarlyReturn.php                           6       0
-tests/input/example-class.php                         38      0
+tests/input/EarlyReturn.php                           7       0
+tests/input/example-class.php                         43      0
+tests/input/ExampleBackedEnum.php                     3       0
+tests/input/Exceptions.php                            1       0
 tests/input/forbidden-comments.php                    14      0
 tests/input/forbidden-functions.php                   6       0
 tests/input/inline_type_hint_assertions.php           7       0
 tests/input/LowCaseTypes.php                          2       0
 tests/input/namespaces-spacing.php                    7       0
-tests/input/NamingCamelCase.php                       6       0
+tests/input/NamingCamelCase.php                       9       0
 tests/input/negation-operator.php                     2       0
-tests/input/new_with_parentheses.php                  18      0
+tests/input/new_with_parentheses.php                  19      0
 tests/input/not_spacing.php                           8       0
-tests/input/null_coalesce_equal_operator.php          1       0
+tests/input/null_coalesce_equal_operator.php          5       0
 tests/input/null_coalesce_operator.php                3       0
+tests/input/null_safe_operator.php                    1       0
 tests/input/optimized-functions.php                   1       0
-tests/input/PropertyDeclaration.php                   6       0
-tests/input/return_type_on_closures.php               21      0
-tests/input/return_type_on_methods.php                17      0
+tests/input/PropertyDeclaration.php                   14      0
+tests/input/return_type_on_closures.php               26      0
+tests/input/return_type_on_methods.php                22      0
 tests/input/semicolon_spacing.php                     3       0
 tests/input/single-line-array-spacing.php             5       0
 tests/input/spread-operator.php                       6       0
@@ -39,16 +42,17 @@ tests/input/strings.php                               1       0
 tests/input/superfluous-naming.php                    11      0
 tests/input/test-case.php                             8       0
 tests/input/trailing_comma_on_array.php               1       0
+tests/input/TrailingCommaOnFunctions.php              6       0
 tests/input/traits-uses.php                           11      0
-tests/input/type-hints.php                            7       0
+tests/input/type-hints.php                            9       0
 tests/input/UnusedVariables.php                       1       0
 tests/input/use-ordering.php                          1       0
 tests/input/useless-semicolon.php                     2       0
-tests/input/UselessConditions.php                     20      0
+tests/input/UselessConditions.php                     21      0
 ----------------------------------------------------------------------
-A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
+A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
index a6530867..f8f7f65d 100644
--- a/tests/fixed/ControlStructures.php
+++ b/tests/fixed/ControlStructures.php
@@ -104,7 +104,7 @@ public function spaceBelowBlocks(): void
 
         try {
             echo 4;
-        } catch (Throwable $throwable) {
+        } catch (Throwable) {
         }
 
         echo 5;
diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
index caf1dbb6..fc734db4 100644
--- a/tests/fixed/EarlyReturn.php
+++ b/tests/fixed/EarlyReturn.php
@@ -11,7 +11,7 @@ public function bar(): bool
         return $bar === 'bar';
     }
 
-    public function foo(): ?string
+    public function foo(): string|null
     {
         foreach ($items as $item) {
             if (! $item->isItem()) {
diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
index fe54eb97..cc38c548 100644
--- a/tests/fixed/ExampleBackedEnum.php
+++ b/tests/fixed/ExampleBackedEnum.php
@@ -3,3 +3,7 @@
 declare(strict_types=1);
 
 namespace ExampleBackedEnum;
+
+enum ExampleBackedEnum: int
+{
+}
diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
index 9b146c6b..db7408b6 100644
--- a/tests/fixed/Exceptions.php
+++ b/tests/fixed/Exceptions.php
@@ -3,3 +3,11 @@
 declare(strict_types=1);
 
 namespace Exceptions;
+
+use Exception;
+use Throwable;
+
+try {
+    throw new Exception();
+} catch (Throwable) {
+}
diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
index 57d9f2b8..54934713 100644
--- a/tests/fixed/NamingCamelCase.php
+++ b/tests/fixed/NamingCamelCase.php
@@ -6,14 +6,11 @@
 
 class NamingCamelCase
 {
-    /** @var mixed */
-    public $A;
+    public mixed $A;
 
-    /** @var mixed */
-    protected $B;
+    protected mixed $B;
 
-    /** @var mixed */
-    private $C;
+    private mixed $C;
 
     public function fcn(string $A): void
     {
diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
index 5c3f27b7..97038972 100644
--- a/tests/fixed/PropertyDeclaration.php
+++ b/tests/fixed/PropertyDeclaration.php
@@ -9,5 +9,10 @@ final class PropertyDeclaration
     public bool $boolPropertyWithDefaultValue = false;
     public string $stringProperty;
     public int $intProperty;
-    public ?string $nullableString = null;
+    public string|null $nullableString = null;
+
+    public function __construct(
+        public readonly Foo $foo,
+    ) {
+    }
 }
diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingCommaOnFunctions.php
index f3ffa91d..42482386 100644
--- a/tests/fixed/TrailingCommaOnFunctions.php
+++ b/tests/fixed/TrailingCommaOnFunctions.php
@@ -15,7 +15,7 @@ public function a(int $arg): void
     }
 
     public function b(
-        int $arg
+        int $arg,
     ): void {
     }
 
@@ -28,7 +28,7 @@ public function uses(): void
         };
 
         $multiLine = static function (int $arg) use (
-            $var
+            $var,
         ): void {
             var_dump($var);
         };
@@ -37,8 +37,9 @@ public function uses(): void
 
 $class = new TrailingCommaOnFunctions();
 
+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
 $class->a(1);
 
 $class->a(
-    1
+    1,
 );
diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.php
index 2151b17e..71e0cfbb 100644
--- a/tests/fixed/UselessConditions.php
+++ b/tests/fixed/UselessConditions.php
@@ -95,7 +95,7 @@ public function necessaryIfConditionWithMethodCall(): bool
         return false;
     }
 
-    public function nullShouldNotBeTreatedAsFalse(): ?bool
+    public function nullShouldNotBeTreatedAsFalse(): bool|null
     {
         if (! $this->isAdmin) {
             return null;
diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
index a45074fe..4da39b82 100644
--- a/tests/fixed/arrow-functions-format.php
+++ b/tests/fixed/arrow-functions-format.php
@@ -18,10 +18,10 @@
 
 $multiLineArrowFunctions = Collection::from([1, 2])
     ->map(
-        static fn (int $v): int => $v * 2
+        static fn (int $v): int => $v * 2,
     )
     ->reduce(
-        static fn (int $tmp, int $v): int => $tmp + $v
+        static fn (int $tmp, int $v): int => $tmp + $v,
     );
 
 $thisIsNotAnArrowFunction = [$this->fn => 'value'];
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
index 998e51d5..56cd9024 100644
--- a/tests/fixed/example-class.php
+++ b/tests/fixed/example-class.php
@@ -25,19 +25,16 @@ class Example implements IteratorAggregate
 {
     private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
 
-    /** @var int|null */
-    private $foo;
+    private int|null $foo = null;
 
     /** @var string[] */
-    private $bar;
+    private array $bar;
 
-    /** @var bool */
-    private $baz;
+    private bool $baz;
 
-    /** @var ControlStructureSniff|int|string|null */
-    private $baxBax;
+    private ControlStructureSniff|int|string|null $baxBax = null;
 
-    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
     {
         $this->foo    = $foo;
         $this->bar    = $bar;
@@ -48,7 +45,7 @@ public function __construct(?int $foo = null, array $bar = [], bool $baz = false
     /**
      * Description
      */
-    public function getFoo(): ?int
+    public function getFoo(): int|null
     {
         return $this->foo;
     }
diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing.php
index d42bbfef..36cbae29 100644
--- a/tests/fixed/namespaces-spacing.php
+++ b/tests/fixed/namespaces-spacing.php
@@ -16,5 +16,5 @@
 strrev(
     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
         ->sub(new DateInterval('P1D'))
-        ->format(DATE_RFC3339)
+        ->format(DATE_RFC3339),
 );
diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parentheses.php
index 6e81bbe6..47a06ecd 100644
--- a/tests/fixed/new_with_parentheses.php
+++ b/tests/fixed/new_with_parentheses.php
@@ -24,5 +24,5 @@
 
 $z = new stdClass() ? new stdClass() : new stdClass();
 
-$q = $q ?: new stdClass();
-$e = $e ?? new stdClass();
+$q   = $q ?: new stdClass();
+$e ??= new stdClass();
diff --git a/tests/fixed/null_coalesce_equal_operator.php b/tests/fixed/null_coalesce_equal_operator.php
index b9974696..6703d309 100644
--- a/tests/fixed/null_coalesce_equal_operator.php
+++ b/tests/fixed/null_coalesce_equal_operator.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-$bar = $bar ?? 'bar';
+$bar ??= 'bar';
 
-$bar['baz'] = $bar['baz'] ?? 'baz';
+$bar['baz'] ??= 'baz';
 
-$bar = $bar ?? 'bar';
+$bar ??= 'bar';
 
-$object->property = $object->property ?? 'Default Value';
+$object->property ??= 'Default Value';
 
-Test::$foo = Test::$foo ?? 123;
+Test::$foo ??= 123;
diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_operator.php
index 8846dd12..51c361c9 100644
--- a/tests/fixed/null_coalesce_operator.php
+++ b/tests/fixed/null_coalesce_operator.php
@@ -4,7 +4,7 @@
 
 $foo = $_GET['foo'] ?? 'foo';
 
-$bar = $bar ?? 'bar';
+$bar ??= 'bar';
 
 $bar = $bar['baz'] ?? 'baz';
 
diff --git a/tests/fixed/null_safe_operator.php b/tests/fixed/null_safe_operator.php
index 5bbb636c..7ce8a3dc 100644
--- a/tests/fixed/null_safe_operator.php
+++ b/tests/fixed/null_safe_operator.php
@@ -2,4 +2,4 @@
 
 declare(strict_types=1);
 
-$var = $object === null ? null : $object->property;
+$var = $object?->property;
diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
index 134bade9..80ad4135 100644
--- a/tests/fixed/return_type_on_closures.php
+++ b/tests/fixed/return_type_on_closures.php
@@ -22,7 +22,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -31,7 +31,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -40,7 +40,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -49,7 +49,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -58,6 +58,6 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
index 8e2c6f7b..0c897ae7 100644
--- a/tests/fixed/return_type_on_methods.php
+++ b/tests/fixed/return_type_on_methods.php
@@ -31,7 +31,7 @@ public function f(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -40,7 +40,7 @@ public function g(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -49,7 +49,7 @@ public function h(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -58,7 +58,7 @@ public function i(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -67,7 +67,7 @@ public function j(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 }
diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
index 10e6f345..5e26ed86 100644
--- a/tests/fixed/type-hints.php
+++ b/tests/fixed/type-hints.php
@@ -10,7 +10,7 @@
 class TraversableTypeHints
 {
     /** @var Traversable */
-    private $parameter;
+    private Traversable $parameter;
 
     /**
      * @param Iterator $iterator
@@ -25,6 +25,5 @@ public function get(Iterator $iterator): Traversable
 
 class UnionTypeHints
 {
-    /** @var int|string|null */
-    private $x = 1;
+    private int|string|null $x = 1;
 }
diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
index a0e0b2e2..73944e3c 100644
--- a/tests/input/ControlStructures.php
+++ b/tests/input/ControlStructures.php
@@ -93,7 +93,7 @@ public function spaceBelowBlocks(): void
         }
         try {
             echo 4;
-        } catch (Throwable $throwable) {
+        } catch (Throwable) {
         }
         echo 5;
     }
diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
index fe54eb97..0c47286c 100644
--- a/tests/input/ExampleBackedEnum.php
+++ b/tests/input/ExampleBackedEnum.php
@@ -3,3 +3,7 @@
 declare(strict_types=1);
 
 namespace ExampleBackedEnum;
+
+enum ExampleBackedEnum :   int
+{
+}
diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
index 9b146c6b..3aaa30fb 100644
--- a/tests/input/Exceptions.php
+++ b/tests/input/Exceptions.php
@@ -3,3 +3,11 @@
 declare(strict_types=1);
 
 namespace Exceptions;
+
+use Exception;
+use Throwable;
+
+try {
+    throw new Exception();
+} catch (Throwable $throwable) {
+}
diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
index 0891e125..acdc4453 100644
--- a/tests/input/PropertyDeclaration.php
+++ b/tests/input/PropertyDeclaration.php
@@ -10,4 +10,9 @@ final class PropertyDeclaration
     public string  $stringProperty;
     public  int $intProperty;
     public ? string $nullableString = null;
+
+    public function __construct(
+        public  readonly  Foo  $foo,
+    ) {
+    }
 }
diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingCommaOnFunctions.php
index f3ffa91d..fc5480eb 100644
--- a/tests/input/TrailingCommaOnFunctions.php
+++ b/tests/input/TrailingCommaOnFunctions.php
@@ -10,7 +10,7 @@
 
 class TrailingCommaOnFunctions
 {
-    public function a(int $arg): void
+    public function a(int $arg,): void
     {
     }
 
@@ -23,7 +23,7 @@ public function uses(): void
     {
         $var = null;
 
-        $singleLine = static function (int $arg) use ($var): void {
+        $singleLine = static function (int $arg) use ($var,): void {
             var_dump($var);
         };
 
@@ -37,7 +37,8 @@ public function uses(): void
 
 $class = new TrailingCommaOnFunctions();
 
-$class->a(1);
+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
+$class->a(1,);
 
 $class->a(
     1
diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-functions-format.php
index 8a358e86..d3903ff7 100644
--- a/tests/input/arrow-functions-format.php
+++ b/tests/input/arrow-functions-format.php
@@ -18,10 +18,10 @@
 
 $multiLineArrowFunctions = Collection::from([1, 2])
     ->map(
-        static fn (int $v): int => $v * 2
+        static fn (int $v): int => $v * 2,
     )
     ->reduce(
-        static fn (int $tmp, int $v): int => $tmp + $v
+        static fn (int $tmp, int $v): int => $tmp + $v,
     );
 
 $thisIsNotAnArrowFunction = [$this->fn => 'value'];
diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing.php
index e1ab639d..e7be0180 100644
--- a/tests/input/namespaces-spacing.php
+++ b/tests/input/namespaces-spacing.php
@@ -11,5 +11,5 @@
 strrev(
     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
         ->sub(new DateInterval('P1D'))
-        ->format(DATE_RFC3339)
+        ->format(DATE_RFC3339),
 );
diff --git a/tests/php81-compatibility.patch b/tests/php72-compatibility.patch
similarity index 60%
rename from tests/php81-compatibility.patch
rename to tests/php72-compatibility.patch
index ca45e483..73713c58 100644
--- a/tests/php81-compatibility.patch
+++ b/tests/php72-compatibility.patch
@@ -1,166 +1,166 @@
 diff --git a/tests/expected_report.txt b/tests/expected_report.txt
-index 53dada5..d53fd48 100644
+index d53fd48..53dada5 100644
 --- a/tests/expected_report.txt
 +++ b/tests/expected_report.txt
-@@ -14,23 +14,26 @@ tests/input/constants-var.php                         7       0
+@@ -14,26 +14,23 @@ tests/input/constants-var.php                         7       0
  tests/input/ControlStructures.php                     28      0
  tests/input/doc-comment-spacing.php                   11      0
  tests/input/duplicate-assignment-variable.php         1       0
--tests/input/EarlyReturn.php                           6       0
--tests/input/example-class.php                         38      0
-+tests/input/EarlyReturn.php                           7       0
-+tests/input/example-class.php                         43      0
-+tests/input/ExampleBackedEnum.php                     3       0
-+tests/input/Exceptions.php                            1       0
+-tests/input/EarlyReturn.php                           7       0
+-tests/input/example-class.php                         43      0
+-tests/input/ExampleBackedEnum.php                     3       0
+-tests/input/Exceptions.php                            1       0
++tests/input/EarlyReturn.php                           6       0
++tests/input/example-class.php                         38      0
  tests/input/forbidden-comments.php                    14      0
  tests/input/forbidden-functions.php                   6       0
  tests/input/inline_type_hint_assertions.php           7       0
  tests/input/LowCaseTypes.php                          2       0
  tests/input/namespaces-spacing.php                    7       0
--tests/input/NamingCamelCase.php                       6       0
-+tests/input/NamingCamelCase.php                       9       0
+-tests/input/NamingCamelCase.php                       9       0
++tests/input/NamingCamelCase.php                       6       0
  tests/input/negation-operator.php                     2       0
--tests/input/new_with_parentheses.php                  18      0
-+tests/input/new_with_parentheses.php                  19      0
+-tests/input/new_with_parentheses.php                  19      0
++tests/input/new_with_parentheses.php                  18      0
  tests/input/not_spacing.php                           8       0
--tests/input/null_coalesce_equal_operator.php          1       0
-+tests/input/null_coalesce_equal_operator.php          5       0
+-tests/input/null_coalesce_equal_operator.php          5       0
++tests/input/null_coalesce_equal_operator.php          1       0
  tests/input/null_coalesce_operator.php                3       0
-+tests/input/null_safe_operator.php                    1       0
+-tests/input/null_safe_operator.php                    1       0
  tests/input/optimized-functions.php                   1       0
--tests/input/PropertyDeclaration.php                   6       0
--tests/input/return_type_on_closures.php               21      0
--tests/input/return_type_on_methods.php                17      0
-+tests/input/PropertyDeclaration.php                   14      0
-+tests/input/return_type_on_closures.php               26      0
-+tests/input/return_type_on_methods.php                22      0
+-tests/input/PropertyDeclaration.php                   14      0
+-tests/input/return_type_on_closures.php               26      0
+-tests/input/return_type_on_methods.php                22      0
++tests/input/PropertyDeclaration.php                   6       0
++tests/input/return_type_on_closures.php               21      0
++tests/input/return_type_on_methods.php                17      0
  tests/input/semicolon_spacing.php                     3       0
  tests/input/single-line-array-spacing.php             5       0
  tests/input/spread-operator.php                       6       0
-@@ -39,16 +42,17 @@ tests/input/strings.php                               1       0
+@@ -42,17 +39,16 @@ tests/input/strings.php                               1       0
  tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0
  tests/input/trailing_comma_on_array.php               1       0
-+tests/input/TrailingCommaOnFunctions.php              6       0
+-tests/input/TrailingCommaOnFunctions.php              6       0
  tests/input/traits-uses.php                           11      0
--tests/input/type-hints.php                            7       0
-+tests/input/type-hints.php                            9       0
+-tests/input/type-hints.php                            9       0
++tests/input/type-hints.php                            7       0
  tests/input/UnusedVariables.php                       1       0
  tests/input/use-ordering.php                          1       0
  tests/input/useless-semicolon.php                     2       0
--tests/input/UselessConditions.php                     20      0
-+tests/input/UselessConditions.php                     21      0
+-tests/input/UselessConditions.php                     21      0
++tests/input/UselessConditions.php                     20      0
  ----------------------------------------------------------------------
--A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
-+A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
+-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
++A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-+PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
++PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------
  
  
 diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
-index a653086..f8f7f65 100644
+index f8f7f65..a653086 100644
 --- a/tests/fixed/ControlStructures.php
 +++ b/tests/fixed/ControlStructures.php
 @@ -104,7 +104,7 @@ class ControlStructures
  
          try {
              echo 4;
--        } catch (Throwable $throwable) {
-+        } catch (Throwable) {
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
          }
  
          echo 5;
 diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
-index caf1dbb..fc734db 100644
+index fc734db..caf1dbb 100644
 --- a/tests/fixed/EarlyReturn.php
 +++ b/tests/fixed/EarlyReturn.php
 @@ -11,7 +11,7 @@ class EarlyReturn
          return $bar === 'bar';
      }
  
--    public function foo(): ?string
-+    public function foo(): string|null
+-    public function foo(): string|null
++    public function foo(): ?string
      {
          foreach ($items as $item) {
              if (! $item->isItem()) {
 diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
-index fe54eb9..cc38c54 100644
+index cc38c54..fe54eb9 100644
 --- a/tests/fixed/ExampleBackedEnum.php
 +++ b/tests/fixed/ExampleBackedEnum.php
-@@ -3,3 +3,7 @@
+@@ -3,7 +3,3 @@
  declare(strict_types=1);
  
  namespace ExampleBackedEnum;
-+
-+enum ExampleBackedEnum: int
-+{
-+}
+-
+-enum ExampleBackedEnum: int
+-{
+-}
 diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
-index 9b146c6..db7408b 100644
+index db7408b..9b146c6 100644
 --- a/tests/fixed/Exceptions.php
 +++ b/tests/fixed/Exceptions.php
-@@ -3,3 +3,11 @@
+@@ -3,11 +3,3 @@
  declare(strict_types=1);
  
  namespace Exceptions;
-+
-+use Exception;
-+use Throwable;
-+
-+try {
-+    throw new Exception();
-+} catch (Throwable) {
-+}
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable) {
+-}
 diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
-index 57d9f2b..5493471 100644
+index 5493471..57d9f2b 100644
 --- a/tests/fixed/NamingCamelCase.php
 +++ b/tests/fixed/NamingCamelCase.php
-@@ -6,14 +6,11 @@ namespace Example;
+@@ -6,11 +6,14 @@ namespace Example;
  
  class NamingCamelCase
  {
--    /** @var mixed */
--    public $A;
-+    public mixed $A;
+-    public mixed $A;
++    /** @var mixed */
++    public $A;
  
--    /** @var mixed */
--    protected $B;
-+    protected mixed $B;
+-    protected mixed $B;
++    /** @var mixed */
++    protected $B;
  
--    /** @var mixed */
--    private $C;
-+    private mixed $C;
+-    private mixed $C;
++    /** @var mixed */
++    private $C;
  
      public function fcn(string $A): void
      {
 diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
-index 5c3f27b..9703897 100644
+index 9703897..5c3f27b 100644
 --- a/tests/fixed/PropertyDeclaration.php
 +++ b/tests/fixed/PropertyDeclaration.php
-@@ -9,5 +9,10 @@ final class PropertyDeclaration
+@@ -9,10 +9,5 @@ final class PropertyDeclaration
      public bool $boolPropertyWithDefaultValue = false;
      public string $stringProperty;
      public int $intProperty;
--    public ?string $nullableString = null;
-+    public string|null $nullableString = null;
-+
-+    public function __construct(
-+        public readonly Foo $foo,
-+    ) {
-+    }
+-    public string|null $nullableString = null;
+-
+-    public function __construct(
+-        public readonly Foo $foo,
+-    ) {
+-    }
++    public ?string $nullableString = null;
  }
 diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingCommaOnFunctions.php
-index f3ffa91..4248238 100644
+index 4248238..f3ffa91 100644
 --- a/tests/fixed/TrailingCommaOnFunctions.php
 +++ b/tests/fixed/TrailingCommaOnFunctions.php
 @@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
      }
  
      public function b(
--        int $arg
-+        int $arg,
+-        int $arg,
++        int $arg
      ): void {
      }
  
@@ -168,168 +168,168 @@ index f3ffa91..4248238 100644
          };
  
          $multiLine = static function (int $arg) use (
--            $var
-+            $var,
+-            $var,
++            $var
          ): void {
              var_dump($var);
          };
-@@ -37,8 +37,9 @@ class TrailingCommaOnFunctions
+@@ -37,9 +37,8 @@ class TrailingCommaOnFunctions
  
  $class = new TrailingCommaOnFunctions();
  
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
+-// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
  $class->a(1);
  
  $class->a(
--    1
-+    1,
+-    1,
++    1
  );
 diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.php
-index 2151b17..71e0cfb 100644
+index 71e0cfb..2151b17 100644
 --- a/tests/fixed/UselessConditions.php
 +++ b/tests/fixed/UselessConditions.php
 @@ -95,7 +95,7 @@ class UselessConditions
          return false;
      }
  
--    public function nullShouldNotBeTreatedAsFalse(): ?bool
-+    public function nullShouldNotBeTreatedAsFalse(): bool|null
+-    public function nullShouldNotBeTreatedAsFalse(): bool|null
++    public function nullShouldNotBeTreatedAsFalse(): ?bool
      {
          if (! $this->isAdmin) {
              return null;
 diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
-index a45074f..4da39b8 100644
+index 4da39b8..a45074f 100644
 --- a/tests/fixed/arrow-functions-format.php
 +++ b/tests/fixed/arrow-functions-format.php
 @@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
  
  $multiLineArrowFunctions = Collection::from([1, 2])
      ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
+-        static fn (int $v): int => $v * 2,
++        static fn (int $v): int => $v * 2
      )
      ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
+-        static fn (int $tmp, int $v): int => $tmp + $v,
++        static fn (int $tmp, int $v): int => $tmp + $v
      );
  
  $thisIsNotAnArrowFunction = [$this->fn => 'value'];
 diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
-index 998e51d..56cd902 100644
+index 56cd902..998e51d 100644
 --- a/tests/fixed/example-class.php
 +++ b/tests/fixed/example-class.php
-@@ -25,19 +25,16 @@ class Example implements IteratorAggregate
+@@ -25,16 +25,19 @@ class Example implements IteratorAggregate
  {
      private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
  
--    /** @var int|null */
--    private $foo;
-+    private int|null $foo = null;
+-    private int|null $foo = null;
++    /** @var int|null */
++    private $foo;
  
      /** @var string[] */
--    private $bar;
-+    private array $bar;
+-    private array $bar;
++    private $bar;
  
--    /** @var bool */
--    private $baz;
-+    private bool $baz;
+-    private bool $baz;
++    /** @var bool */
++    private $baz;
  
--    /** @var ControlStructureSniff|int|string|null */
--    private $baxBax;
-+    private ControlStructureSniff|int|string|null $baxBax = null;
+-    private ControlStructureSniff|int|string|null $baxBax = null;
++    /** @var ControlStructureSniff|int|string|null */
++    private $baxBax;
  
--    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
-+    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+-    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
++    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
      {
          $this->foo    = $foo;
          $this->bar    = $bar;
-@@ -48,7 +45,7 @@ class Example implements IteratorAggregate
+@@ -45,7 +48,7 @@ class Example implements IteratorAggregate
      /**
       * Description
       */
--    public function getFoo(): ?int
-+    public function getFoo(): int|null
+-    public function getFoo(): int|null
++    public function getFoo(): ?int
      {
          return $this->foo;
      }
 diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing.php
-index d42bbfe..36cbae2 100644
+index 36cbae2..d42bbfe 100644
 --- a/tests/fixed/namespaces-spacing.php
 +++ b/tests/fixed/namespaces-spacing.php
 @@ -16,5 +16,5 @@ use const DATE_RFC3339;
  strrev(
      (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
          ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
+-        ->format(DATE_RFC3339),
++        ->format(DATE_RFC3339)
  );
 diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parentheses.php
-index 6e81bbe..47a06ec 100644
+index 47a06ec..6e81bbe 100644
 --- a/tests/fixed/new_with_parentheses.php
 +++ b/tests/fixed/new_with_parentheses.php
 @@ -24,5 +24,5 @@ $y = [new stdClass()];
  
  $z = new stdClass() ? new stdClass() : new stdClass();
  
--$q = $q ?: new stdClass();
--$e = $e ?? new stdClass();
-+$q   = $q ?: new stdClass();
-+$e ??= new stdClass();
+-$q   = $q ?: new stdClass();
+-$e ??= new stdClass();
++$q = $q ?: new stdClass();
++$e = $e ?? new stdClass();
 diff --git a/tests/fixed/null_coalesce_equal_operator.php b/tests/fixed/null_coalesce_equal_operator.php
-index b997469..6703d30 100644
+index 6703d30..b997469 100644
 --- a/tests/fixed/null_coalesce_equal_operator.php
 +++ b/tests/fixed/null_coalesce_equal_operator.php
 @@ -2,12 +2,12 @@
  
  declare(strict_types=1);
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
  
--$bar['baz'] = $bar['baz'] ?? 'baz';
-+$bar['baz'] ??= 'baz';
+-$bar['baz'] ??= 'baz';
++$bar['baz'] = $bar['baz'] ?? 'baz';
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
  
--$object->property = $object->property ?? 'Default Value';
-+$object->property ??= 'Default Value';
+-$object->property ??= 'Default Value';
++$object->property = $object->property ?? 'Default Value';
  
--Test::$foo = Test::$foo ?? 123;
-+Test::$foo ??= 123;
+-Test::$foo ??= 123;
++Test::$foo = Test::$foo ?? 123;
 diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_operator.php
-index 8846dd1..51c361c 100644
+index 51c361c..8846dd1 100644
 --- a/tests/fixed/null_coalesce_operator.php
 +++ b/tests/fixed/null_coalesce_operator.php
 @@ -4,7 +4,7 @@ declare(strict_types=1);
  
  $foo = $_GET['foo'] ?? 'foo';
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
  
  $bar = $bar['baz'] ?? 'baz';
  
 diff --git a/tests/fixed/null_safe_operator.php b/tests/fixed/null_safe_operator.php
-index 5bbb636..7ce8a3d 100644
+index 7ce8a3d..5bbb636 100644
 --- a/tests/fixed/null_safe_operator.php
 +++ b/tests/fixed/null_safe_operator.php
 @@ -2,4 +2,4 @@
  
  declare(strict_types=1);
  
--$var = $object === null ? null : $object->property;
-+$var = $object?->property;
+-$var = $object?->property;
++$var = $object === null ? null : $object->property;
 diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
-index 134bade..80ad413 100644
+index 80ad413..134bade 100644
 --- a/tests/fixed/return_type_on_closures.php
 +++ b/tests/fixed/return_type_on_closures.php
 @@ -22,7 +22,7 @@ static function (
      int $c,
      int $d,
      int $e,
--    int $b
-+    int $b,
+-    int $b,
++    int $b
  ): void {
  }
  
@@ -337,8 +337,8 @@ index 134bade..80ad413 100644
      int $c,
      int $d,
      int $e,
--    int $b
-+    int $b,
+-    int $b,
++    int $b
  ): void {
  }
  
@@ -346,8 +346,8 @@ index 134bade..80ad413 100644
      int $c,
      int $d,
      int $e,
--    int $b
-+    int $b,
+-    int $b,
++    int $b
  ): void {
  }
  
@@ -355,8 +355,8 @@ index 134bade..80ad413 100644
      int $c,
      int $d,
      int $e,
--    int $b
-+    int $b,
+-    int $b,
++    int $b
  ): void {
  }
  
@@ -364,20 +364,20 @@ index 134bade..80ad413 100644
      int $c,
      int $d,
      int $e,
--    int $b
-+    int $b,
+-    int $b,
++    int $b
  ): void {
  }
 diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
-index 8e2c6f7..0c897ae 100644
+index 0c897ae..8e2c6f7 100644
 --- a/tests/fixed/return_type_on_methods.php
 +++ b/tests/fixed/return_type_on_methods.php
 @@ -31,7 +31,7 @@ class Test
          int $c,
          int $d,
          int $e,
--        int $b
-+        int $b,
+-        int $b,
++        int $b
      ): void {
      }
  
@@ -385,8 +385,8 @@ index 8e2c6f7..0c897ae 100644
          int $c,
          int $d,
          int $e,
--        int $b
-+        int $b,
+-        int $b,
++        int $b
      ): void {
      }
  
@@ -394,8 +394,8 @@ index 8e2c6f7..0c897ae 100644
          int $c,
          int $d,
          int $e,
--        int $b
-+        int $b,
+-        int $b,
++        int $b
      ): void {
      }
  
@@ -403,8 +403,8 @@ index 8e2c6f7..0c897ae 100644
          int $c,
          int $d,
          int $e,
--        int $b
-+        int $b,
+-        int $b,
++        int $b
      ): void {
      }
  
@@ -412,97 +412,97 @@ index 8e2c6f7..0c897ae 100644
          int $c,
          int $d,
          int $e,
--        int $b
-+        int $b,
+-        int $b,
++        int $b
      ): void {
      }
  }
 diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
-index 10e6f34..5e26ed8 100644
+index 5e26ed8..10e6f34 100644
 --- a/tests/fixed/type-hints.php
 +++ b/tests/fixed/type-hints.php
 @@ -10,7 +10,7 @@ use Traversable;
  class TraversableTypeHints
  {
      /** @var Traversable */
--    private $parameter;
-+    private Traversable $parameter;
+-    private Traversable $parameter;
++    private $parameter;
  
      /**
       * @param Iterator $iterator
-@@ -25,6 +25,5 @@ class TraversableTypeHints
+@@ -25,5 +25,6 @@ class TraversableTypeHints
  
  class UnionTypeHints
  {
--    /** @var int|string|null */
--    private $x = 1;
-+    private int|string|null $x = 1;
+-    private int|string|null $x = 1;
++    /** @var int|string|null */
++    private $x = 1;
  }
 diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
-index a0e0b2e..73944e3 100644
+index 73944e3..a0e0b2e 100644
 --- a/tests/input/ControlStructures.php
 +++ b/tests/input/ControlStructures.php
 @@ -93,7 +93,7 @@ class ControlStructures
          }
          try {
              echo 4;
--        } catch (Throwable $throwable) {
-+        } catch (Throwable) {
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
          }
          echo 5;
      }
 diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
-index fe54eb9..0c47286 100644
+index 0c47286..fe54eb9 100644
 --- a/tests/input/ExampleBackedEnum.php
 +++ b/tests/input/ExampleBackedEnum.php
-@@ -3,3 +3,7 @@
+@@ -3,7 +3,3 @@
  declare(strict_types=1);
  
  namespace ExampleBackedEnum;
-+
-+enum ExampleBackedEnum :   int
-+{
-+}
+-
+-enum ExampleBackedEnum :   int
+-{
+-}
 diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
-index 9b146c6..3aaa30f 100644
+index 3aaa30f..9b146c6 100644
 --- a/tests/input/Exceptions.php
 +++ b/tests/input/Exceptions.php
-@@ -3,3 +3,11 @@
+@@ -3,11 +3,3 @@
  declare(strict_types=1);
  
  namespace Exceptions;
-+
-+use Exception;
-+use Throwable;
-+
-+try {
-+    throw new Exception();
-+} catch (Throwable $throwable) {
-+}
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable $throwable) {
+-}
 diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
-index 0891e12..acdc445 100644
+index acdc445..0891e12 100644
 --- a/tests/input/PropertyDeclaration.php
 +++ b/tests/input/PropertyDeclaration.php
-@@ -10,4 +10,9 @@ final class PropertyDeclaration
+@@ -10,9 +10,4 @@ final class PropertyDeclaration
      public string  $stringProperty;
      public  int $intProperty;
      public ? string $nullableString = null;
-+
-+    public function __construct(
-+        public  readonly  Foo  $foo,
-+    ) {
-+    }
+-
+-    public function __construct(
+-        public  readonly  Foo  $foo,
+-    ) {
+-    }
  }
 diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingCommaOnFunctions.php
-index f3ffa91..fc5480e 100644
+index fc5480e..f3ffa91 100644
 --- a/tests/input/TrailingCommaOnFunctions.php
 +++ b/tests/input/TrailingCommaOnFunctions.php
 @@ -10,7 +10,7 @@ use function var_dump;
  
  class TrailingCommaOnFunctions
  {
--    public function a(int $arg): void
-+    public function a(int $arg,): void
+-    public function a(int $arg,): void
++    public function a(int $arg): void
      {
      }
  
@@ -510,46 +510,46 @@ index f3ffa91..fc5480e 100644
      {
          $var = null;
  
--        $singleLine = static function (int $arg) use ($var): void {
-+        $singleLine = static function (int $arg) use ($var,): void {
+-        $singleLine = static function (int $arg) use ($var,): void {
++        $singleLine = static function (int $arg) use ($var): void {
              var_dump($var);
          };
  
-@@ -37,7 +37,8 @@ class TrailingCommaOnFunctions
+@@ -37,8 +37,7 @@ class TrailingCommaOnFunctions
  
  $class = new TrailingCommaOnFunctions();
  
--$class->a(1);
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
-+$class->a(1,);
+-// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
+-$class->a(1,);
++$class->a(1);
  
  $class->a(
      1
 diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-functions-format.php
-index 8a358e8..d3903ff 100644
+index d3903ff..8a358e8 100644
 --- a/tests/input/arrow-functions-format.php
 +++ b/tests/input/arrow-functions-format.php
 @@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
  
  $multiLineArrowFunctions = Collection::from([1, 2])
      ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
+-        static fn (int $v): int => $v * 2,
++        static fn (int $v): int => $v * 2
      )
      ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
+-        static fn (int $tmp, int $v): int => $tmp + $v,
++        static fn (int $tmp, int $v): int => $tmp + $v
      );
  
  $thisIsNotAnArrowFunction = [$this->fn => 'value'];
 diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing.php
-index e1ab639..e7be018 100644
+index e7be018..e1ab639 100644
 --- a/tests/input/namespaces-spacing.php
 +++ b/tests/input/namespaces-spacing.php
 @@ -11,5 +11,5 @@ use const DATE_RFC3339;
  strrev(
      (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
          ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
+-        ->format(DATE_RFC3339),
++        ->format(DATE_RFC3339)
  );
diff --git a/tests/php73-compatibility.patch b/tests/php73-compatibility.patch
index c7537181..b7362b60 100644
--- a/tests/php73-compatibility.patch
+++ b/tests/php73-compatibility.patch
@@ -1,109 +1,479 @@
 diff --git a/tests/expected_report.txt b/tests/expected_report.txt
-index 1d5a7d3..fae9e70 100644
+index d53fd48..5616fdf 100644
 --- a/tests/expected_report.txt
 +++ b/tests/expected_report.txt
-@@ -39,6 +39,7 @@ tests/input/strings.php                               1       0
+@@ -14,26 +14,23 @@ tests/input/constants-var.php                         7       0
+ tests/input/ControlStructures.php                     28      0
+ tests/input/doc-comment-spacing.php                   11      0
+ tests/input/duplicate-assignment-variable.php         1       0
+-tests/input/EarlyReturn.php                           7       0
+-tests/input/example-class.php                         43      0
+-tests/input/ExampleBackedEnum.php                     3       0
+-tests/input/Exceptions.php                            1       0
++tests/input/EarlyReturn.php                           6       0
++tests/input/example-class.php                         38      0
+ tests/input/forbidden-comments.php                    14      0
+ tests/input/forbidden-functions.php                   6       0
+ tests/input/inline_type_hint_assertions.php           7       0
+ tests/input/LowCaseTypes.php                          2       0
+ tests/input/namespaces-spacing.php                    7       0
+-tests/input/NamingCamelCase.php                       9       0
++tests/input/NamingCamelCase.php                       6       0
+ tests/input/negation-operator.php                     2       0
+-tests/input/new_with_parentheses.php                  19      0
++tests/input/new_with_parentheses.php                  18      0
+ tests/input/not_spacing.php                           8       0
+-tests/input/null_coalesce_equal_operator.php          5       0
++tests/input/null_coalesce_equal_operator.php          1       0
+ tests/input/null_coalesce_operator.php                3       0
+-tests/input/null_safe_operator.php                    1       0
+ tests/input/optimized-functions.php                   1       0
+-tests/input/PropertyDeclaration.php                   14      0
+-tests/input/return_type_on_closures.php               26      0
+-tests/input/return_type_on_methods.php                22      0
++tests/input/PropertyDeclaration.php                   6       0
++tests/input/return_type_on_closures.php               21      0
++tests/input/return_type_on_methods.php                17      0
+ tests/input/semicolon_spacing.php                     3       0
+ tests/input/single-line-array-spacing.php             5       0
+ tests/input/spread-operator.php                       6       0
+@@ -42,17 +39,17 @@ tests/input/strings.php                               1       0
  tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0
  tests/input/trailing_comma_on_array.php               1       0
+-tests/input/TrailingCommaOnFunctions.php              6       0
 +tests/input/TrailingCommaOnFunctions.php              2       0
  tests/input/traits-uses.php                           11      0
- tests/input/type-hints.php                            7       0
+-tests/input/type-hints.php                            9       0
++tests/input/type-hints.php                            7       0
  tests/input/UnusedVariables.php                       1       0
-@@ -46,9 +47,9 @@ tests/input/use-ordering.php                          1       0
+ tests/input/use-ordering.php                          1       0
  tests/input/useless-semicolon.php                     2       0
- tests/input/UselessConditions.php                     20      0
+-tests/input/UselessConditions.php                     21      0
++tests/input/UselessConditions.php                     20      0
  ----------------------------------------------------------------------
--A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
+-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
 +A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 +PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------
  
  
+diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
+index f8f7f65..a653086 100644
+--- a/tests/fixed/ControlStructures.php
++++ b/tests/fixed/ControlStructures.php
+@@ -104,7 +104,7 @@ class ControlStructures
+ 
+         try {
+             echo 4;
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
+         }
+ 
+         echo 5;
+diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
+index fc734db..caf1dbb 100644
+--- a/tests/fixed/EarlyReturn.php
++++ b/tests/fixed/EarlyReturn.php
+@@ -11,7 +11,7 @@ class EarlyReturn
+         return $bar === 'bar';
+     }
+ 
+-    public function foo(): string|null
++    public function foo(): ?string
+     {
+         foreach ($items as $item) {
+             if (! $item->isItem()) {
+diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
+index cc38c54..fe54eb9 100644
+--- a/tests/fixed/ExampleBackedEnum.php
++++ b/tests/fixed/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum: int
+-{
+-}
+diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
+index db7408b..9b146c6 100644
+--- a/tests/fixed/Exceptions.php
++++ b/tests/fixed/Exceptions.php
+@@ -3,11 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace Exceptions;
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable) {
+-}
+diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
+index 5493471..57d9f2b 100644
+--- a/tests/fixed/NamingCamelCase.php
++++ b/tests/fixed/NamingCamelCase.php
+@@ -6,11 +6,14 @@ namespace Example;
+ 
+ class NamingCamelCase
+ {
+-    public mixed $A;
++    /** @var mixed */
++    public $A;
+ 
+-    protected mixed $B;
++    /** @var mixed */
++    protected $B;
+ 
+-    private mixed $C;
++    /** @var mixed */
++    private $C;
+ 
+     public function fcn(string $A): void
+     {
+diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
+index 9703897..5c3f27b 100644
+--- a/tests/fixed/PropertyDeclaration.php
++++ b/tests/fixed/PropertyDeclaration.php
+@@ -9,10 +9,5 @@ final class PropertyDeclaration
+     public bool $boolPropertyWithDefaultValue = false;
+     public string $stringProperty;
+     public int $intProperty;
+-    public string|null $nullableString = null;
+-
+-    public function __construct(
+-        public readonly Foo $foo,
+-    ) {
+-    }
++    public ?string $nullableString = null;
+ }
 diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingCommaOnFunctions.php
-index f3ffa91..67173b3 100644
+index 4248238..67173b3 100644
 --- a/tests/fixed/TrailingCommaOnFunctions.php
 +++ b/tests/fixed/TrailingCommaOnFunctions.php
-@@ -37,8 +37,9 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
- $class->a(1);
- 
- $class->a(
--    1
-+    1,
- );
-diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
-index a45074f..4da39b8 100644
---- a/tests/fixed/arrow-functions-format.php
-+++ b/tests/fixed/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
-diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing.php
-index d42bbfe..36cbae2 100644
---- a/tests/fixed/namespaces-spacing.php
-+++ b/tests/fixed/namespaces-spacing.php
-@@ -16,5 +16,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
+@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
+     }
+ 
+     public function b(
+-        int $arg,
++        int $arg
+     ): void {
+     }
+ 
+@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
+         };
+ 
+         $multiLine = static function (int $arg) use (
+-            $var,
++            $var
+         ): void {
+             var_dump($var);
+         };
+diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.php
+index 71e0cfb..2151b17 100644
+--- a/tests/fixed/UselessConditions.php
++++ b/tests/fixed/UselessConditions.php
+@@ -95,7 +95,7 @@ class UselessConditions
+         return false;
+     }
+ 
+-    public function nullShouldNotBeTreatedAsFalse(): bool|null
++    public function nullShouldNotBeTreatedAsFalse(): ?bool
+     {
+         if (! $this->isAdmin) {
+             return null;
+diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
+index 56cd902..998e51d 100644
+--- a/tests/fixed/example-class.php
++++ b/tests/fixed/example-class.php
+@@ -25,16 +25,19 @@ class Example implements IteratorAggregate
+ {
+     private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+ 
+-    private int|null $foo = null;
++    /** @var int|null */
++    private $foo;
+ 
+     /** @var string[] */
+-    private array $bar;
++    private $bar;
+ 
+-    private bool $baz;
++    /** @var bool */
++    private $baz;
+ 
+-    private ControlStructureSniff|int|string|null $baxBax = null;
++    /** @var ControlStructureSniff|int|string|null */
++    private $baxBax;
+ 
+-    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
++    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+     {
+         $this->foo    = $foo;
+         $this->bar    = $bar;
+@@ -45,7 +48,7 @@ class Example implements IteratorAggregate
+     /**
+      * Description
+      */
+-    public function getFoo(): int|null
++    public function getFoo(): ?int
+     {
+         return $this->foo;
+     }
+diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parentheses.php
+index 47a06ec..6e81bbe 100644
+--- a/tests/fixed/new_with_parentheses.php
++++ b/tests/fixed/new_with_parentheses.php
+@@ -24,5 +24,5 @@ $y = [new stdClass()];
+ 
+ $z = new stdClass() ? new stdClass() : new stdClass();
+ 
+-$q   = $q ?: new stdClass();
+-$e ??= new stdClass();
++$q = $q ?: new stdClass();
++$e = $e ?? new stdClass();
+diff --git a/tests/fixed/null_coalesce_equal_operator.php b/tests/fixed/null_coalesce_equal_operator.php
+index 6703d30..b997469 100644
+--- a/tests/fixed/null_coalesce_equal_operator.php
++++ b/tests/fixed/null_coalesce_equal_operator.php
+@@ -2,12 +2,12 @@
+ 
+ declare(strict_types=1);
+ 
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
+ 
+-$bar['baz'] ??= 'baz';
++$bar['baz'] = $bar['baz'] ?? 'baz';
+ 
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
+ 
+-$object->property ??= 'Default Value';
++$object->property = $object->property ?? 'Default Value';
+ 
+-Test::$foo ??= 123;
++Test::$foo = Test::$foo ?? 123;
+diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_operator.php
+index 51c361c..8846dd1 100644
+--- a/tests/fixed/null_coalesce_operator.php
++++ b/tests/fixed/null_coalesce_operator.php
+@@ -4,7 +4,7 @@ declare(strict_types=1);
+ 
+ $foo = $_GET['foo'] ?? 'foo';
+ 
+-$bar ??= 'bar';
++$bar = $bar ?? 'bar';
+ 
+ $bar = $bar['baz'] ?? 'baz';
+ 
+diff --git a/tests/fixed/null_safe_operator.php b/tests/fixed/null_safe_operator.php
+index 7ce8a3d..5bbb636 100644
+--- a/tests/fixed/null_safe_operator.php
++++ b/tests/fixed/null_safe_operator.php
+@@ -2,4 +2,4 @@
+ 
+ declare(strict_types=1);
+ 
+-$var = $object?->property;
++$var = $object === null ? null : $object->property;
+diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
+index 80ad413..134bade 100644
+--- a/tests/fixed/return_type_on_closures.php
++++ b/tests/fixed/return_type_on_closures.php
+@@ -22,7 +22,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+ 
+@@ -31,7 +31,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+ 
+@@ -40,7 +40,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+ 
+@@ -49,7 +49,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+ 
+@@ -58,6 +58,6 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
+index 0c897ae..8e2c6f7 100644
+--- a/tests/fixed/return_type_on_methods.php
++++ b/tests/fixed/return_type_on_methods.php
+@@ -31,7 +31,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ 
+@@ -40,7 +40,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ 
+@@ -49,7 +49,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ 
+@@ -58,7 +58,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ 
+@@ -67,7 +67,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ }
+diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
+index 5e26ed8..10e6f34 100644
+--- a/tests/fixed/type-hints.php
++++ b/tests/fixed/type-hints.php
+@@ -10,7 +10,7 @@ use Traversable;
+ class TraversableTypeHints
+ {
+     /** @var Traversable */
+-    private Traversable $parameter;
++    private $parameter;
+ 
+     /**
+      * @param Iterator $iterator
+@@ -25,5 +25,6 @@ class TraversableTypeHints
+ 
+ class UnionTypeHints
+ {
+-    private int|string|null $x = 1;
++    /** @var int|string|null */
++    private $x = 1;
+ }
+diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
+index 73944e3..a0e0b2e 100644
+--- a/tests/input/ControlStructures.php
++++ b/tests/input/ControlStructures.php
+@@ -93,7 +93,7 @@ class ControlStructures
+         }
+         try {
+             echo 4;
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
+         }
+         echo 5;
+     }
+diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
+index 0c47286..fe54eb9 100644
+--- a/tests/input/ExampleBackedEnum.php
++++ b/tests/input/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum :   int
+-{
+-}
+diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
+index 3aaa30f..9b146c6 100644
+--- a/tests/input/Exceptions.php
++++ b/tests/input/Exceptions.php
+@@ -3,11 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace Exceptions;
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable $throwable) {
+-}
+diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
+index acdc445..0891e12 100644
+--- a/tests/input/PropertyDeclaration.php
++++ b/tests/input/PropertyDeclaration.php
+@@ -10,9 +10,4 @@ final class PropertyDeclaration
+     public string  $stringProperty;
+     public  int $intProperty;
+     public ? string $nullableString = null;
+-
+-    public function __construct(
+-        public  readonly  Foo  $foo,
+-    ) {
+-    }
+ }
 diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingCommaOnFunctions.php
-index f3ffa91..8adcedf 100644
+index fc5480e..8adcedf 100644
 --- a/tests/input/TrailingCommaOnFunctions.php
 +++ b/tests/input/TrailingCommaOnFunctions.php
-@@ -37,7 +37,8 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
--$class->a(1);
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
-+$class->a(1,);
- 
- $class->a(
-     1
-diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-functions-format.php
-index 8a358e8..d3903ff 100644
---- a/tests/input/arrow-functions-format.php
-+++ b/tests/input/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
-diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing.php
-index e1ab639..e7be018 100644
---- a/tests/input/namespaces-spacing.php
-+++ b/tests/input/namespaces-spacing.php
-@@ -11,5 +11,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
+@@ -10,7 +10,7 @@ use function var_dump;
+ 
+ class TrailingCommaOnFunctions
+ {
+-    public function a(int $arg,): void
++    public function a(int $arg): void
+     {
+     }
+ 
+@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
+     {
+         $var = null;
+ 
+-        $singleLine = static function (int $arg) use ($var,): void {
++        $singleLine = static function (int $arg) use ($var): void {
+             var_dump($var);
+         };
+ 
diff --git a/tests/php74-compatibility.patch b/tests/php74-compatibility.patch
index 3a379bc1..6de0406a 100644
--- a/tests/php74-compatibility.patch
+++ b/tests/php74-compatibility.patch
@@ -1,213 +1,417 @@
 diff --git a/tests/expected_report.txt b/tests/expected_report.txt
-index 1d5a7d3..91e97e7 100644
+index d53fd48..dc2cf18 100644
 --- a/tests/expected_report.txt
 +++ b/tests/expected_report.txt
-@@ -15,7 +15,7 @@ tests/input/ControlStructures.php                     28      0
+@@ -14,26 +14,23 @@ tests/input/constants-var.php                         7       0
+ tests/input/ControlStructures.php                     28      0
  tests/input/doc-comment-spacing.php                   11      0
  tests/input/duplicate-assignment-variable.php         1       0
- tests/input/EarlyReturn.php                           6       0
--tests/input/example-class.php                         38      0
+-tests/input/EarlyReturn.php                           7       0
+-tests/input/example-class.php                         43      0
+-tests/input/ExampleBackedEnum.php                     3       0
+-tests/input/Exceptions.php                            1       0
++tests/input/EarlyReturn.php                           6       0
 +tests/input/example-class.php                         41      0
  tests/input/forbidden-comments.php                    14      0
  tests/input/forbidden-functions.php                   6       0
  tests/input/inline_type_hint_assertions.php           7       0
-@@ -23,9 +23,9 @@ tests/input/LowCaseTypes.php                          2       0
+ tests/input/LowCaseTypes.php                          2       0
  tests/input/namespaces-spacing.php                    7       0
- tests/input/NamingCamelCase.php                       6       0
+-tests/input/NamingCamelCase.php                       9       0
++tests/input/NamingCamelCase.php                       6       0
  tests/input/negation-operator.php                     2       0
--tests/input/new_with_parentheses.php                  18      0
-+tests/input/new_with_parentheses.php                  19      0
+ tests/input/new_with_parentheses.php                  19      0
  tests/input/not_spacing.php                           8       0
--tests/input/null_coalesce_equal_operator.php          1       0
-+tests/input/null_coalesce_equal_operator.php          5       0
+ tests/input/null_coalesce_equal_operator.php          5       0
  tests/input/null_coalesce_operator.php                3       0
+-tests/input/null_safe_operator.php                    1       0
  tests/input/optimized-functions.php                   1       0
- tests/input/PropertyDeclaration.php                   6       0
-@@ -39,16 +39,17 @@ tests/input/strings.php                               1       0
+-tests/input/PropertyDeclaration.php                   14      0
+-tests/input/return_type_on_closures.php               26      0
+-tests/input/return_type_on_methods.php                22      0
++tests/input/PropertyDeclaration.php                   6       0
++tests/input/return_type_on_closures.php               21      0
++tests/input/return_type_on_methods.php                17      0
+ tests/input/semicolon_spacing.php                     3       0
+ tests/input/single-line-array-spacing.php             5       0
+ tests/input/spread-operator.php                       6       0
+@@ -42,17 +39,17 @@ tests/input/strings.php                               1       0
  tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0
  tests/input/trailing_comma_on_array.php               1       0
+-tests/input/TrailingCommaOnFunctions.php              6       0
 +tests/input/TrailingCommaOnFunctions.php              2       0
  tests/input/traits-uses.php                           11      0
--tests/input/type-hints.php                            7       0
+-tests/input/type-hints.php                            9       0
 +tests/input/type-hints.php                            8       0
  tests/input/UnusedVariables.php                       1       0
  tests/input/use-ordering.php                          1       0
  tests/input/useless-semicolon.php                     2       0
- tests/input/UselessConditions.php                     20      0
+-tests/input/UselessConditions.php                     21      0
++tests/input/UselessConditions.php                     20      0
  ----------------------------------------------------------------------
--A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
+-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
 +A TOTAL OF 393 ERRORS AND 0 WARNINGS WERE FOUND IN 43 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 +PHPCBF CAN FIX 328 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------
  
  
+diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
+index f8f7f65..a653086 100644
+--- a/tests/fixed/ControlStructures.php
++++ b/tests/fixed/ControlStructures.php
+@@ -104,7 +104,7 @@ class ControlStructures
+ 
+         try {
+             echo 4;
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
+         }
+ 
+         echo 5;
+diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
+index fc734db..caf1dbb 100644
+--- a/tests/fixed/EarlyReturn.php
++++ b/tests/fixed/EarlyReturn.php
+@@ -11,7 +11,7 @@ class EarlyReturn
+         return $bar === 'bar';
+     }
+ 
+-    public function foo(): string|null
++    public function foo(): ?string
+     {
+         foreach ($items as $item) {
+             if (! $item->isItem()) {
+diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
+index cc38c54..fe54eb9 100644
+--- a/tests/fixed/ExampleBackedEnum.php
++++ b/tests/fixed/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum: int
+-{
+-}
+diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
+index db7408b..9b146c6 100644
+--- a/tests/fixed/Exceptions.php
++++ b/tests/fixed/Exceptions.php
+@@ -3,11 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace Exceptions;
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable) {
+-}
+diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
+index 5493471..57d9f2b 100644
+--- a/tests/fixed/NamingCamelCase.php
++++ b/tests/fixed/NamingCamelCase.php
+@@ -6,11 +6,14 @@ namespace Example;
+ 
+ class NamingCamelCase
+ {
+-    public mixed $A;
++    /** @var mixed */
++    public $A;
+ 
+-    protected mixed $B;
++    /** @var mixed */
++    protected $B;
+ 
+-    private mixed $C;
++    /** @var mixed */
++    private $C;
+ 
+     public function fcn(string $A): void
+     {
+diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
+index 9703897..5c3f27b 100644
+--- a/tests/fixed/PropertyDeclaration.php
++++ b/tests/fixed/PropertyDeclaration.php
+@@ -9,10 +9,5 @@ final class PropertyDeclaration
+     public bool $boolPropertyWithDefaultValue = false;
+     public string $stringProperty;
+     public int $intProperty;
+-    public string|null $nullableString = null;
+-
+-    public function __construct(
+-        public readonly Foo $foo,
+-    ) {
+-    }
++    public ?string $nullableString = null;
+ }
 diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingCommaOnFunctions.php
-index f3ffa91..67173b3 100644
+index 4248238..67173b3 100644
 --- a/tests/fixed/TrailingCommaOnFunctions.php
 +++ b/tests/fixed/TrailingCommaOnFunctions.php
-@@ -37,8 +37,9 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
- $class->a(1);
- 
- $class->a(
--    1
-+    1,
- );
-diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
-index a45074f..4da39b8 100644
---- a/tests/fixed/arrow-functions-format.php
-+++ b/tests/fixed/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
+@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
+     }
+ 
+     public function b(
+-        int $arg,
++        int $arg
+     ): void {
+     }
+ 
+@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
+         };
+ 
+         $multiLine = static function (int $arg) use (
+-            $var,
++            $var
+         ): void {
+             var_dump($var);
+         };
+diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.php
+index 71e0cfb..2151b17 100644
+--- a/tests/fixed/UselessConditions.php
++++ b/tests/fixed/UselessConditions.php
+@@ -95,7 +95,7 @@ class UselessConditions
+         return false;
+     }
+ 
+-    public function nullShouldNotBeTreatedAsFalse(): bool|null
++    public function nullShouldNotBeTreatedAsFalse(): ?bool
+     {
+         if (! $this->isAdmin) {
+             return null;
 diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
-index 998e51d..7866379 100644
+index 56cd902..7866379 100644
 --- a/tests/fixed/example-class.php
 +++ b/tests/fixed/example-class.php
-@@ -25,14 +25,12 @@ class Example implements IteratorAggregate
+@@ -25,16 +25,17 @@ class Example implements IteratorAggregate
  {
      private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
  
--    /** @var int|null */
--    private $foo;
+-    private int|null $foo = null;
 +    private ?int $foo = null;
  
      /** @var string[] */
--    private $bar;
-+    private array $bar;
- 
--    /** @var bool */
--    private $baz;
-+    private bool $baz;
- 
-     /** @var ControlStructureSniff|int|string|null */
-     private $baxBax;
-diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing.php
-index d42bbfe..36cbae2 100644
---- a/tests/fixed/namespaces-spacing.php
-+++ b/tests/fixed/namespaces-spacing.php
-@@ -16,5 +16,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
-diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parentheses.php
-index 6e81bbe..47a06ec 100644
---- a/tests/fixed/new_with_parentheses.php
-+++ b/tests/fixed/new_with_parentheses.php
-@@ -24,5 +24,5 @@ $y = [new stdClass()];
- 
- $z = new stdClass() ? new stdClass() : new stdClass();
- 
--$q = $q ?: new stdClass();
--$e = $e ?? new stdClass();
-+$q   = $q ?: new stdClass();
-+$e ??= new stdClass();
-diff --git a/tests/fixed/null_coalesce_equal_operator.php b/tests/fixed/null_coalesce_equal_operator.php
-index b997469..6703d30 100644
---- a/tests/fixed/null_coalesce_equal_operator.php
-+++ b/tests/fixed/null_coalesce_equal_operator.php
-@@ -2,12 +2,12 @@
+     private array $bar;
+ 
+     private bool $baz;
+ 
+-    private ControlStructureSniff|int|string|null $baxBax = null;
++    /** @var ControlStructureSniff|int|string|null */
++    private $baxBax;
+ 
+-    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
++    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+     {
+         $this->foo    = $foo;
+         $this->bar    = $bar;
+@@ -45,7 +46,7 @@ class Example implements IteratorAggregate
+     /**
+      * Description
+      */
+-    public function getFoo(): int|null
++    public function getFoo(): ?int
+     {
+         return $this->foo;
+     }
+diff --git a/tests/fixed/null_safe_operator.php b/tests/fixed/null_safe_operator.php
+index 7ce8a3d..5bbb636 100644
+--- a/tests/fixed/null_safe_operator.php
++++ b/tests/fixed/null_safe_operator.php
+@@ -2,4 +2,4 @@
  
  declare(strict_types=1);
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+-$var = $object?->property;
++$var = $object === null ? null : $object->property;
+diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
+index 80ad413..134bade 100644
+--- a/tests/fixed/return_type_on_closures.php
++++ b/tests/fixed/return_type_on_closures.php
+@@ -22,7 +22,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
  
--$bar['baz'] = $bar['baz'] ?? 'baz';
-+$bar['baz'] ??= 'baz';
+@@ -31,7 +31,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+@@ -40,7 +40,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
  
--$object->property = $object->property ?? 'Default Value';
-+$object->property ??= 'Default Value';
+@@ -49,7 +49,7 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
  
--Test::$foo = Test::$foo ?? 123;
-+Test::$foo ??= 123;
-diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_operator.php
-index 8846dd1..51c361c 100644
---- a/tests/fixed/null_coalesce_operator.php
-+++ b/tests/fixed/null_coalesce_operator.php
-@@ -4,7 +4,7 @@ declare(strict_types=1);
+@@ -58,6 +58,6 @@ static function (
+     int $c,
+     int $d,
+     int $e,
+-    int $b,
++    int $b
+ ): void {
+ }
+diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
+index 0c897ae..8e2c6f7 100644
+--- a/tests/fixed/return_type_on_methods.php
++++ b/tests/fixed/return_type_on_methods.php
+@@ -31,7 +31,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
  
- $foo = $_GET['foo'] ?? 'foo';
+@@ -40,7 +40,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
  
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+@@ -49,7 +49,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
  
- $bar = $bar['baz'] ?? 'baz';
+@@ -58,7 +58,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
  
+@@ -67,7 +67,7 @@ class Test
+         int $c,
+         int $d,
+         int $e,
+-        int $b,
++        int $b
+     ): void {
+     }
+ }
 diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
-index 10e6f34..bfa6d4f 100644
+index 5e26ed8..bfa6d4f 100644
 --- a/tests/fixed/type-hints.php
 +++ b/tests/fixed/type-hints.php
-@@ -10,7 +10,7 @@ use Traversable;
- class TraversableTypeHints
+@@ -25,5 +25,6 @@ class TraversableTypeHints
+ 
+ class UnionTypeHints
  {
-     /** @var Traversable */
--    private $parameter;
-+    private Traversable $parameter;
+-    private int|string|null $x = 1;
++    /** @var int|string|null */
++    private $x = 1;
+ }
+diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
+index 73944e3..a0e0b2e 100644
+--- a/tests/input/ControlStructures.php
++++ b/tests/input/ControlStructures.php
+@@ -93,7 +93,7 @@ class ControlStructures
+         }
+         try {
+             echo 4;
+-        } catch (Throwable) {
++        } catch (Throwable $throwable) {
+         }
+         echo 5;
+     }
+diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
+index 0c47286..fe54eb9 100644
+--- a/tests/input/ExampleBackedEnum.php
++++ b/tests/input/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
+ declare(strict_types=1);
  
-     /**
-      * @param Iterator $iterator
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum :   int
+-{
+-}
+diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
+index 3aaa30f..9b146c6 100644
+--- a/tests/input/Exceptions.php
++++ b/tests/input/Exceptions.php
+@@ -3,11 +3,3 @@
+ declare(strict_types=1);
+ 
+ namespace Exceptions;
+-
+-use Exception;
+-use Throwable;
+-
+-try {
+-    throw new Exception();
+-} catch (Throwable $throwable) {
+-}
+diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
+index acdc445..0891e12 100644
+--- a/tests/input/PropertyDeclaration.php
++++ b/tests/input/PropertyDeclaration.php
+@@ -10,9 +10,4 @@ final class PropertyDeclaration
+     public string  $stringProperty;
+     public  int $intProperty;
+     public ? string $nullableString = null;
+-
+-    public function __construct(
+-        public  readonly  Foo  $foo,
+-    ) {
+-    }
+ }
 diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingCommaOnFunctions.php
-index f3ffa91..8adcedf 100644
+index fc5480e..8adcedf 100644
 --- a/tests/input/TrailingCommaOnFunctions.php
 +++ b/tests/input/TrailingCommaOnFunctions.php
-@@ -37,7 +37,8 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
--$class->a(1);
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
-+$class->a(1,);
- 
- $class->a(
-     1
-diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-functions-format.php
-index 8a358e8..d3903ff 100644
---- a/tests/input/arrow-functions-format.php
-+++ b/tests/input/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
-diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing.php
-index e1ab639..e7be018 100644
---- a/tests/input/namespaces-spacing.php
-+++ b/tests/input/namespaces-spacing.php
-@@ -11,5 +11,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
+@@ -10,7 +10,7 @@ use function var_dump;
+ 
+ class TrailingCommaOnFunctions
+ {
+-    public function a(int $arg,): void
++    public function a(int $arg): void
+     {
+     }
+ 
+@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
+     {
+         $var = null;
+ 
+-        $singleLine = static function (int $arg) use ($var,): void {
++        $singleLine = static function (int $arg) use ($var): void {
+             var_dump($var);
+         };
+ 
diff --git a/tests/php80-compatibility.patch b/tests/php80-compatibility.patch
index 09831cd2..13c12c06 100644
--- a/tests/php80-compatibility.patch
+++ b/tests/php80-compatibility.patch
@@ -1,530 +1,83 @@
 diff --git a/tests/expected_report.txt b/tests/expected_report.txt
-index 53dada5..741d972 100644
+index d53fd48..741d972 100644
 --- a/tests/expected_report.txt
 +++ b/tests/expected_report.txt
-@@ -14,23 +14,25 @@ tests/input/constants-var.php                         7       0
- tests/input/ControlStructures.php                     28      0
- tests/input/doc-comment-spacing.php                   11      0
+@@ -16,7 +16,6 @@ tests/input/doc-comment-spacing.php                   11      0
  tests/input/duplicate-assignment-variable.php         1       0
--tests/input/EarlyReturn.php                           6       0
--tests/input/example-class.php                         38      0
-+tests/input/EarlyReturn.php                           7       0
-+tests/input/example-class.php                         43      0
-+tests/input/Exceptions.php                            1       0
+ tests/input/EarlyReturn.php                           7       0
+ tests/input/example-class.php                         43      0
+-tests/input/ExampleBackedEnum.php                     3       0
+ tests/input/Exceptions.php                            1       0
  tests/input/forbidden-comments.php                    14      0
  tests/input/forbidden-functions.php                   6       0
- tests/input/inline_type_hint_assertions.php           7       0
- tests/input/LowCaseTypes.php                          2       0
- tests/input/namespaces-spacing.php                    7       0
--tests/input/NamingCamelCase.php                       6       0
-+tests/input/NamingCamelCase.php                       9       0
- tests/input/negation-operator.php                     2       0
--tests/input/new_with_parentheses.php                  18      0
-+tests/input/new_with_parentheses.php                  19      0
- tests/input/not_spacing.php                           8       0
--tests/input/null_coalesce_equal_operator.php          1       0
-+tests/input/null_coalesce_equal_operator.php          5       0
+@@ -31,7 +30,7 @@ tests/input/null_coalesce_equal_operator.php          5       0
  tests/input/null_coalesce_operator.php                3       0
-+tests/input/null_safe_operator.php                    1       0
+ tests/input/null_safe_operator.php                    1       0
  tests/input/optimized-functions.php                   1       0
--tests/input/PropertyDeclaration.php                   6       0
--tests/input/return_type_on_closures.php               21      0
--tests/input/return_type_on_methods.php                17      0
+-tests/input/PropertyDeclaration.php                   14      0
 +tests/input/PropertyDeclaration.php                   11      0
-+tests/input/return_type_on_closures.php               26      0
-+tests/input/return_type_on_methods.php                22      0
+ tests/input/return_type_on_closures.php               26      0
+ tests/input/return_type_on_methods.php                22      0
  tests/input/semicolon_spacing.php                     3       0
- tests/input/single-line-array-spacing.php             5       0
- tests/input/spread-operator.php                       6       0
-@@ -39,16 +41,17 @@ tests/input/strings.php                               1       0
- tests/input/superfluous-naming.php                    11      0
- tests/input/test-case.php                             8       0
- tests/input/trailing_comma_on_array.php               1       0
-+tests/input/TrailingCommaOnFunctions.php              6       0
- tests/input/traits-uses.php                           11      0
--tests/input/type-hints.php                            7       0
-+tests/input/type-hints.php                            9       0
- tests/input/UnusedVariables.php                       1       0
- tests/input/use-ordering.php                          1       0
+@@ -50,9 +49,9 @@ tests/input/use-ordering.php                          1       0
  tests/input/useless-semicolon.php                     2       0
--tests/input/UselessConditions.php                     20      0
-+tests/input/UselessConditions.php                     21      0
+ tests/input/UselessConditions.php                     21      0
  ----------------------------------------------------------------------
--A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
+-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
 +A TOTAL OF 422 ERRORS AND 0 WARNINGS WERE FOUND IN 45 FILES
  ----------------------------------------------------------------------
--PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+-PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 +PHPCBF CAN FIX 357 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
  ----------------------------------------------------------------------
  
  
-diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
-index a653086..f8f7f65 100644
---- a/tests/fixed/ControlStructures.php
-+++ b/tests/fixed/ControlStructures.php
-@@ -104,7 +104,7 @@ class ControlStructures
- 
-         try {
-             echo 4;
--        } catch (Throwable $throwable) {
-+        } catch (Throwable) {
-         }
- 
-         echo 5;
-diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
-index caf1dbb..fc734db 100644
---- a/tests/fixed/EarlyReturn.php
-+++ b/tests/fixed/EarlyReturn.php
-@@ -11,7 +11,7 @@ class EarlyReturn
-         return $bar === 'bar';
-     }
- 
--    public function foo(): ?string
-+    public function foo(): string|null
-     {
-         foreach ($items as $item) {
-             if (! $item->isItem()) {
-diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
-index 9b146c6..db7408b 100644
---- a/tests/fixed/Exceptions.php
-+++ b/tests/fixed/Exceptions.php
-@@ -3,3 +3,11 @@
+diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
+index cc38c54..fe54eb9 100644
+--- a/tests/fixed/ExampleBackedEnum.php
++++ b/tests/fixed/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
  declare(strict_types=1);
  
- namespace Exceptions;
-+
-+use Exception;
-+use Throwable;
-+
-+try {
-+    throw new Exception();
-+} catch (Throwable) {
-+}
-diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
-index 57d9f2b..5493471 100644
---- a/tests/fixed/NamingCamelCase.php
-+++ b/tests/fixed/NamingCamelCase.php
-@@ -6,14 +6,11 @@ namespace Example;
- 
- class NamingCamelCase
- {
--    /** @var mixed */
--    public $A;
-+    public mixed $A;
- 
--    /** @var mixed */
--    protected $B;
-+    protected mixed $B;
- 
--    /** @var mixed */
--    private $C;
-+    private mixed $C;
- 
-     public function fcn(string $A): void
-     {
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum: int
+-{
+-}
 diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
-index 5c3f27b..7821d5c 100644
+index 9703897..7821d5c 100644
 --- a/tests/fixed/PropertyDeclaration.php
 +++ b/tests/fixed/PropertyDeclaration.php
-@@ -9,5 +9,10 @@ final class PropertyDeclaration
-     public bool $boolPropertyWithDefaultValue = false;
-     public string $stringProperty;
-     public int $intProperty;
--    public ?string $nullableString = null;
-+    public string|null $nullableString = null;
-+
-+    public function __construct(
-+        public Foo $foo,
-+    ) {
-+    }
- }
-diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingCommaOnFunctions.php
-index f3ffa91..4248238 100644
---- a/tests/fixed/TrailingCommaOnFunctions.php
-+++ b/tests/fixed/TrailingCommaOnFunctions.php
-@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
-     }
- 
-     public function b(
--        int $arg
-+        int $arg,
-     ): void {
-     }
- 
-@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
-         };
- 
-         $multiLine = static function (int $arg) use (
--            $var
-+            $var,
-         ): void {
-             var_dump($var);
-         };
-@@ -37,8 +37,9 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
- $class->a(1);
- 
- $class->a(
--    1
-+    1,
- );
-diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.php
-index 2151b17..71e0cfb 100644
---- a/tests/fixed/UselessConditions.php
-+++ b/tests/fixed/UselessConditions.php
-@@ -95,7 +95,7 @@ class UselessConditions
-         return false;
-     }
- 
--    public function nullShouldNotBeTreatedAsFalse(): ?bool
-+    public function nullShouldNotBeTreatedAsFalse(): bool|null
-     {
-         if (! $this->isAdmin) {
-             return null;
-diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-functions-format.php
-index a45074f..4da39b8 100644
---- a/tests/fixed/arrow-functions-format.php
-+++ b/tests/fixed/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
-diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
-index 998e51d..56cd902 100644
---- a/tests/fixed/example-class.php
-+++ b/tests/fixed/example-class.php
-@@ -25,19 +25,16 @@ class Example implements IteratorAggregate
- {
-     private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
- 
--    /** @var int|null */
--    private $foo;
-+    private int|null $foo = null;
- 
-     /** @var string[] */
--    private $bar;
-+    private array $bar;
- 
--    /** @var bool */
--    private $baz;
-+    private bool $baz;
- 
--    /** @var ControlStructureSniff|int|string|null */
--    private $baxBax;
-+    private ControlStructureSniff|int|string|null $baxBax = null;
- 
--    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
-+    public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
-     {
-         $this->foo    = $foo;
-         $this->bar    = $bar;
-@@ -48,7 +45,7 @@ class Example implements IteratorAggregate
-     /**
-      * Description
-      */
--    public function getFoo(): ?int
-+    public function getFoo(): int|null
-     {
-         return $this->foo;
-     }
-diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing.php
-index d42bbfe..36cbae2 100644
---- a/tests/fixed/namespaces-spacing.php
-+++ b/tests/fixed/namespaces-spacing.php
-@@ -16,5 +16,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
-diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parentheses.php
-index 6e81bbe..47a06ec 100644
---- a/tests/fixed/new_with_parentheses.php
-+++ b/tests/fixed/new_with_parentheses.php
-@@ -24,5 +24,5 @@ $y = [new stdClass()];
- 
- $z = new stdClass() ? new stdClass() : new stdClass();
- 
--$q = $q ?: new stdClass();
--$e = $e ?? new stdClass();
-+$q   = $q ?: new stdClass();
-+$e ??= new stdClass();
-diff --git a/tests/fixed/null_coalesce_equal_operator.php b/tests/fixed/null_coalesce_equal_operator.php
-index b997469..6703d30 100644
---- a/tests/fixed/null_coalesce_equal_operator.php
-+++ b/tests/fixed/null_coalesce_equal_operator.php
-@@ -2,12 +2,12 @@
- 
- declare(strict_types=1);
- 
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
- 
--$bar['baz'] = $bar['baz'] ?? 'baz';
-+$bar['baz'] ??= 'baz';
- 
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
- 
--$object->property = $object->property ?? 'Default Value';
-+$object->property ??= 'Default Value';
- 
--Test::$foo = Test::$foo ?? 123;
-+Test::$foo ??= 123;
-diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_operator.php
-index 8846dd1..51c361c 100644
---- a/tests/fixed/null_coalesce_operator.php
-+++ b/tests/fixed/null_coalesce_operator.php
-@@ -4,7 +4,7 @@ declare(strict_types=1);
- 
- $foo = $_GET['foo'] ?? 'foo';
- 
--$bar = $bar ?? 'bar';
-+$bar ??= 'bar';
+@@ -12,7 +12,7 @@ final class PropertyDeclaration
+     public string|null $nullableString = null;
  
- $bar = $bar['baz'] ?? 'baz';
- 
-diff --git a/tests/fixed/null_safe_operator.php b/tests/fixed/null_safe_operator.php
-index 5bbb636..7ce8a3d 100644
---- a/tests/fixed/null_safe_operator.php
-+++ b/tests/fixed/null_safe_operator.php
-@@ -2,4 +2,4 @@
- 
- declare(strict_types=1);
- 
--$var = $object === null ? null : $object->property;
-+$var = $object?->property;
-diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
-index 134bade..80ad413 100644
---- a/tests/fixed/return_type_on_closures.php
-+++ b/tests/fixed/return_type_on_closures.php
-@@ -22,7 +22,7 @@ static function (
-     int $c,
-     int $d,
-     int $e,
--    int $b
-+    int $b,
- ): void {
- }
- 
-@@ -31,7 +31,7 @@ static function (
-     int $c,
-     int $d,
-     int $e,
--    int $b
-+    int $b,
- ): void {
- }
- 
-@@ -40,7 +40,7 @@ static function (
-     int $c,
-     int $d,
-     int $e,
--    int $b
-+    int $b,
- ): void {
- }
- 
-@@ -49,7 +49,7 @@ static function (
-     int $c,
-     int $d,
-     int $e,
--    int $b
-+    int $b,
- ): void {
- }
- 
-@@ -58,6 +58,6 @@ static function (
-     int $c,
-     int $d,
-     int $e,
--    int $b
-+    int $b,
- ): void {
- }
-diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
-index 8e2c6f7..0c897ae 100644
---- a/tests/fixed/return_type_on_methods.php
-+++ b/tests/fixed/return_type_on_methods.php
-@@ -31,7 +31,7 @@ class Test
-         int $c,
-         int $d,
-         int $e,
--        int $b
-+        int $b,
-     ): void {
-     }
- 
-@@ -40,7 +40,7 @@ class Test
-         int $c,
-         int $d,
-         int $e,
--        int $b
-+        int $b,
-     ): void {
-     }
- 
-@@ -49,7 +49,7 @@ class Test
-         int $c,
-         int $d,
-         int $e,
--        int $b
-+        int $b,
-     ): void {
-     }
- 
-@@ -58,7 +58,7 @@ class Test
-         int $c,
-         int $d,
-         int $e,
--        int $b
-+        int $b,
-     ): void {
-     }
- 
-@@ -67,7 +67,7 @@ class Test
-         int $c,
-         int $d,
-         int $e,
--        int $b
-+        int $b,
-     ): void {
+     public function __construct(
+-        public readonly Foo $foo,
++        public Foo $foo,
+     ) {
      }
  }
-diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
-index 10e6f34..5e26ed8 100644
---- a/tests/fixed/type-hints.php
-+++ b/tests/fixed/type-hints.php
-@@ -10,7 +10,7 @@ use Traversable;
- class TraversableTypeHints
- {
-     /** @var Traversable */
--    private $parameter;
-+    private Traversable $parameter;
- 
-     /**
-      * @param Iterator $iterator
-@@ -25,6 +25,5 @@ class TraversableTypeHints
- 
- class UnionTypeHints
- {
--    /** @var int|string|null */
--    private $x = 1;
-+    private int|string|null $x = 1;
- }
-diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
-index a0e0b2e..73944e3 100644
---- a/tests/input/ControlStructures.php
-+++ b/tests/input/ControlStructures.php
-@@ -93,7 +93,7 @@ class ControlStructures
-         }
-         try {
-             echo 4;
--        } catch (Throwable $throwable) {
-+        } catch (Throwable) {
-         }
-         echo 5;
-     }
-diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
-index 9b146c6..3aaa30f 100644
---- a/tests/input/Exceptions.php
-+++ b/tests/input/Exceptions.php
-@@ -3,3 +3,11 @@
+diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
+index 0c47286..fe54eb9 100644
+--- a/tests/input/ExampleBackedEnum.php
++++ b/tests/input/ExampleBackedEnum.php
+@@ -3,7 +3,3 @@
  declare(strict_types=1);
  
- namespace Exceptions;
-+
-+use Exception;
-+use Throwable;
-+
-+try {
-+    throw new Exception();
-+} catch (Throwable $throwable) {
-+}
+ namespace ExampleBackedEnum;
+-
+-enum ExampleBackedEnum :   int
+-{
+-}
 diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
-index 0891e12..4eb8164 100644
+index acdc445..4eb8164 100644
 --- a/tests/input/PropertyDeclaration.php
 +++ b/tests/input/PropertyDeclaration.php
-@@ -10,4 +10,9 @@ final class PropertyDeclaration
-     public string  $stringProperty;
-     public  int $intProperty;
+@@ -12,7 +12,7 @@ final class PropertyDeclaration
      public ? string $nullableString = null;
-+
-+    public function __construct(
-+        public Foo  $foo
-+    ) {
-+    }
- }
-diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingCommaOnFunctions.php
-index f3ffa91..fc5480e 100644
---- a/tests/input/TrailingCommaOnFunctions.php
-+++ b/tests/input/TrailingCommaOnFunctions.php
-@@ -10,7 +10,7 @@ use function var_dump;
  
- class TrailingCommaOnFunctions
- {
--    public function a(int $arg): void
-+    public function a(int $arg,): void
-     {
+     public function __construct(
+-        public  readonly  Foo  $foo,
++        public Foo  $foo
+     ) {
      }
- 
-@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
-     {
-         $var = null;
- 
--        $singleLine = static function (int $arg) use ($var): void {
-+        $singleLine = static function (int $arg) use ($var,): void {
-             var_dump($var);
-         };
- 
-@@ -37,7 +37,8 @@ class TrailingCommaOnFunctions
- 
- $class = new TrailingCommaOnFunctions();
- 
--$class->a(1);
-+// phpcs:ignore Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma
-+$class->a(1,);
- 
- $class->a(
-     1
-diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-functions-format.php
-index 8a358e8..d3903ff 100644
---- a/tests/input/arrow-functions-format.php
-+++ b/tests/input/arrow-functions-format.php
-@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
- 
- $multiLineArrowFunctions = Collection::from([1, 2])
-     ->map(
--        static fn (int $v): int => $v * 2
-+        static fn (int $v): int => $v * 2,
-     )
-     ->reduce(
--        static fn (int $tmp, int $v): int => $tmp + $v
-+        static fn (int $tmp, int $v): int => $tmp + $v,
-     );
- 
- $thisIsNotAnArrowFunction = [$this->fn => 'value'];
-diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing.php
-index e1ab639..e7be018 100644
---- a/tests/input/namespaces-spacing.php
-+++ b/tests/input/namespaces-spacing.php
-@@ -11,5 +11,5 @@ use const DATE_RFC3339;
- strrev(
-     (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
-         ->sub(new DateInterval('P1D'))
--        ->format(DATE_RFC3339)
-+        ->format(DATE_RFC3339),
- );
+ }