Merge pull request #8737 from weirdan/enforce-arrow-function-formatting

Enforce arrow function formatting
vimeo · Nov 23, 2022 · 3b6faf9 · 3b6faf9
2 parents 54db596 + 026354a
commit 3b6faf9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -245,4 +245,17 @@
             <property name="allowNested" value="true"/>
         </properties>
     </rule>
+
+    <!-- 
+        Forces uniform arrow function style
+        https://github.com/slevomat/coding-standard/blob/master/doc/functions.md#slevomatcodingstandardfunctionsarrowfunctiondeclaration-
+    -->
+    <rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration">
+        <properties>
+            <property name="spacesCountAfterKeyword" value="0"/>
+            <property name="spacesCountBeforeArrow" value="1"/>
+            <property name="spacesCountAfterArrow" value="1"/>
+            <property name="allowMultiLine" value="true"/>
+        </properties>
+    </rule>
 </ruleset>
diff --git a/src/Psalm/Internal/Analyzer/MethodComparator.php b/src/Psalm/Internal/Analyzer/MethodComparator.php
@@ -127,7 +127,7 @@ public static function compare(
             && !$implementer_method_storage->signature_return_type
             && !array_filter(
                 $implementer_method_storage->attributes,
-                static fn (AttributeStorage $s): bool => $s->fq_class_name === 'ReturnTypeWillChange'
+                static fn(AttributeStorage $s): bool => $s->fq_class_name === 'ReturnTypeWillChange'
             )
         ) {
             IssueBuffer::maybeAdd(

diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php
@@ -100,7 +100,7 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
                 /** @param non-empty-array<?Union> $sub */
                 function (array $sub) use ($null) {
                     $sub = array_map(
-                        fn (?Union $t) => $t ?? $null,
+                        fn(?Union $t) => $t ?? $null,
                         $sub
                     );
                     return new Union([new TKeyedArray($sub, null, null, true)]);

diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -649,7 +649,7 @@ private static function reconcileNonEmptyCountable(
                             $existing_var_type->removeType('array');
                             $existing_var_type->addType($array_atomic_type->setProperties(
                                 array_map(
-                                    fn (Union $union) => $union->setPossiblyUndefined(false),
+                                    fn(Union $union) => $union->setPossiblyUndefined(false),
                                     $array_atomic_type->properties
                                 )
                             ));
@@ -740,7 +740,7 @@ private static function reconcileExactlyCountable(
                         $existing_var_type->removeType('array');
                         $existing_var_type->addType($array_atomic_type->setProperties(
                             array_map(
-                                fn (Union $union) => $union->setPossiblyUndefined(false),
+                                fn(Union $union) => $union->setPossiblyUndefined(false),
                                 $array_atomic_type->properties
                             )
                         ));