RequireArrowFunctionSniff: Fixed fixer

Author: kukulich

SlevomatCodingStandard/Sniffs/Functions/RequireArrowFunctionSniff.php

@@ -8,6 +8,7 @@
 use SlevomatCodingStandard\Helpers\TokenHelper;
 use function count;
 use const T_BITWISE_AND;
+use const T_CLOSE_PARENTHESIS;
 use const T_CLOSURE;
 use const T_FN;
 use const T_RETURN;
@@ -73,15 +74,25 @@ public function process(File $phpcsFile, $closurePointer): void
 
 		$pointerAfterReturn = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $returnPointer + 1);
 		$semicolonAfterReturn = $this->findSemicolon($phpcsFile, $returnPointer);
+		$usePointer = TokenHelper::findNext($phpcsFile, T_USE, $tokens[$closurePointer]['parenthesis_closer'] + 1, $tokens[$closurePointer]['scope_opener']);
+		$nonWhitespacePointerBeforeScopeOpener = TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $tokens[$closurePointer]['scope_opener'] - 1);
 
 		$phpcsFile->fixer->beginChangeset();
 		$phpcsFile->fixer->replaceToken($closurePointer, 'fn');
 
-		for ($i = $tokens[$closurePointer]['parenthesis_closer'] + 1; $i < $pointerAfterReturn; $i++) {
+		if ($usePointer !== null) {
+			$useParenthesiCloserPointer = TokenHelper::findNext($phpcsFile, T_CLOSE_PARENTHESIS, $usePointer + 1);
+			$nonWhitespacePointerAfterUseParanthesisCloser = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $useParenthesiCloserPointer + 1);
+			for ($i = $tokens[$closurePointer]['parenthesis_closer'] + 1; $i < $nonWhitespacePointerAfterUseParanthesisCloser; $i++) {
+				$phpcsFile->fixer->replaceToken($i, '');
+			}
+		}
+
+		for ($i = $nonWhitespacePointerBeforeScopeOpener + 1; $i < $pointerAfterReturn; $i++) {
 			$phpcsFile->fixer->replaceToken($i, '');
 		}
 
-		$phpcsFile->fixer->addContent($tokens[$closurePointer]['parenthesis_closer'], ' => ');
+		$phpcsFile->fixer->addContent($nonWhitespacePointerBeforeScopeOpener, ' => ');
 
 		for ($i = $semicolonAfterReturn; $i <= $tokens[$closurePointer]['scope_closer']; $i++) {
 			$phpcsFile->fixer->replaceToken($i, '');

tests/Sniffs/Functions/data/requireArrowFunctionAllowNestedErrors.fixed.php

@@ -1,3 +1,3 @@
 <?php // lint >= 7.4
 
-$a = fn ($aa) => fn ($bb) => fn ($cc) => $aa + $bb + $cc;
+$a = fn ($aa) => fn ($bb): int => fn ($cc): int => $aa + $bb + $cc;

tests/Sniffs/Functions/data/requireArrowFunctionAllowNestedErrors.php

@@ -1,8 +1,8 @@
 <?php // lint >= 7.4
 
 $a = function ($aa) {
-	return function ($bb) use ($aa) {
-		return function ($cc) use ($bb, $aa) {
+	return function ($bb) use ($aa): int {
+		return function ($cc) use ($bb, $aa): int {
 			return $aa + $bb + $cc;
 		};
 	};

tests/Sniffs/Functions/data/requireArrowFunctionDisallowNestedErrors.fixed.php

@@ -4,6 +4,6 @@
 
 $b = fn ($bb) => $bb + $a;
 
-$c = function ($cc) {
-	return fn () => $cc + 1;
+$c = function ($cc): int {
+	return fn (): int => $cc + 1;
 };

tests/Sniffs/Functions/data/requireArrowFunctionDisallowNestedErrors.php

@@ -8,8 +8,8 @@
 	return $bb + $a;
 };
 
-$c = function ($cc) {
-	return function () use ($cc) {
+$c = function ($cc): int {
+	return function () use ($cc): int {
 		return $cc + 1;
 	};
 };