feat: add rules for trailing commas in function calls and closure use

Makefile

@@ -8,6 +8,13 @@ test-report: vendor
 test-fix: vendor
 	./bin/test-fix
 
+update-compatibility-patch-73:
+	@git apply tests/php73-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/php73-compatibility.patch && git apply -R tests/php73-compatibility.patch
+	@git commit -m 'Update compatibility patch' tests/php73-compatibility.patch
+
 update-compatibility-patch-74:
 	@git apply tests/php74-compatibility.patch
 	@printf "Please open your editor and apply your changes\n"

lib/Doctrine/ruleset.xml

@@ -291,12 +291,28 @@
             <property name="spacesCountAfterArrow" value="1"/>
         </properties>
     </rule>
+    <!-- Disallow trailing commas in single line function calls -->
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
+        <properties>
+            <property name="onlySingleLine" value="true" />
+        </properties>
+    </rule>
+    <!-- Disallow trailing commas in single line closure use -->
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse">
+        <properties>
+            <property name="onlySingleLine" value="true" />
+        </properties>
+    </rule>
     <!-- Disallow trailing commas in single line function declarations -->
     <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
         <properties>
             <property name="onlySingleLine" value="true" />
         </properties>
     </rule>
+    <!-- Require trailing commas in multiline function calls -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
+    <!-- Require trailing commas in multiline closure use -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse"/>
     <!-- Require trailing commas in multiline function declarations -->
     <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
     <!-- Require closures not referencing $this be static -->

phpcs.xml.dist

@@ -12,6 +12,7 @@
 
     <!-- Show progress of the run -->
     <arg value="p"/>
+    <arg value="s"/>
 
     <rule ref="Doctrine"/>
 

tests/fixed/TrailingCommaOnFunctions.php

@@ -4,6 +4,10 @@
 
 namespace Doctrine;
 
+use function var_dump;
+
+// phpcs:disable PSR1.Files.SideEffects
+
 class TrailingCommaOnFunctions
 {
     public function a(int $arg): void
@@ -14,4 +18,27 @@ public function b(
         int $arg
     ): void {
     }
+
+    public function uses(): void
+    {
+        $var = null;
+
+        $singleLine = static function (int $arg) use ($var): void {
+            var_dump($var);
+        };
+
+        $multiLine = static function (int $arg) use (
+            $var
+        ): void {
+            var_dump($var);
+        };
+    }
 }
+
+$class = new TrailingCommaOnFunctions();
+
+$class->a(1);
+
+$class->a(
+    1
+);

tests/input/TrailingCommaOnFunctions.php

@@ -4,6 +4,10 @@
 
 namespace Doctrine;
 
+use function var_dump;
+
+// phpcs:disable PSR1.Files.SideEffects
+
 class TrailingCommaOnFunctions
 {
     public function a(int $arg): void
@@ -14,4 +18,27 @@ public function b(
         int $arg
     ): void {
     }
+
+    public function uses(): void
+    {
+        $var = null;
+
+        $singleLine = static function (int $arg) use ($var): void {
+            var_dump($var);
+        };
+
+        $multiLine = static function (int $arg) use (
+            $var
+        ): void {
+            var_dump($var);
+        };
+    }
 }
+
+$class = new TrailingCommaOnFunctions();
+
+$class->a(1);
+
+$class->a(
+    1
+);

tests/php73-compatibility.patch

@@ -0,0 +1,34 @@
+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/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'];