Require trailing comma in function declaration

Author: ondrejmirtes

build/rector-downgrade.php

@@ -6,6 +6,7 @@
 use Rector\DowngradePhp74\Rector\Coalesce\DowngradeNullCoalescingOperatorRector;
 use Rector\DowngradePhp74\Rector\ArrowFunction\ArrowFunctionToAnonymousFunctionRector;
 use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector;
+use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeTrailingCommasInParamUseRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 
@@ -33,6 +34,10 @@
 
 	$services = $containerConfigurator->services();
 
+	if ($targetPhpVersionId < 80000) {
+		$services->set(DowngradeTrailingCommasInParamUseRector::class);
+	}
+
 	if ($targetPhpVersionId < 70400) {
 		$services->set(DowngradeTypedPropertyRector::class);
 		$services->set(DowngradeNullCoalescingOperatorRector::class);

compiler/src/Console/CompileCommand.php

@@ -47,7 +47,7 @@ public function __construct(
 		Filesystem $filesystem,
 		ProcessFactory $processFactory,
 		string $dataDir,
-		string $buildDir
+		string $buildDir,
 	)
 	{
 		parent::__construct();

phpcs.xml

@@ -147,6 +147,11 @@
 		</properties>
 	</rule>
 	<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration">
+		<properties>
+			<property name="enable" value="true"/>
+		</properties>
+	</rule>
 	<exclude-pattern>tests/*/data</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_1.php</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_2.php</exclude-pattern>

src/Analyser/Analyser.php

@@ -33,7 +33,7 @@ public function __construct(
 		FileAnalyser $fileAnalyser,
 		Registry $registry,
 		NodeScopeResolver $nodeScopeResolver,
-		int $internalErrorsCountLimit
+		int $internalErrorsCountLimit,
 	)
 	{
 		$this->fileAnalyser = $fileAnalyser;
@@ -53,7 +53,7 @@ public function analyse(
 		?Closure $preFileCallback = null,
 		?Closure $postFileCallback = null,
 		bool $debug = false,
-		?array $allAnalysedFiles = null
+		?array $allAnalysedFiles = null,
 	): AnalyserResult
 	{
 		if ($allAnalysedFiles === null) {

src/Analyser/AnalyserResult.php

@@ -36,7 +36,7 @@ public function __construct(
 		array $internalErrors,
 		?array $dependencies,
 		array $exportedNodes,
-		bool $reachedInternalErrorsCountLimit
+		bool $reachedInternalErrorsCountLimit,
 	)
 	{
 		$this->unorderedErrors = $errors;

src/Analyser/ConditionalExpressionHolder.php

@@ -22,7 +22,7 @@ class ConditionalExpressionHolder
 	 */
 	public function __construct(
 		array $conditionExpressionTypes,
-		VariableTypeHolder $typeHolder
+		VariableTypeHolder $typeHolder,
 	)
 	{
 		if (count($conditionExpressionTypes) === 0) {

src/Analyser/DirectScopeFactory.php

@@ -60,7 +60,7 @@ public function __construct(
 		NodeScopeResolver $nodeScopeResolver,
 		bool $treatPhpDocTypesAsCertain,
 		Container $container,
-		PhpVersion $phpVersion
+		PhpVersion $phpVersion,
 	)
 	{
 		$this->scopeClass = $scopeClass;
@@ -104,7 +104,7 @@ public function create(
 		array $nativeExpressionTypes = [],
 		array $inFunctionCallsStack = [],
 		bool $afterExtractCall = false,
-		?Scope $parentScope = null
+		?Scope $parentScope = null,
 	): MutatingScope
 	{
 		$scopeClass = $this->scopeClass;

src/Analyser/EnsuredNonNullabilityResultExpression.php

@@ -17,7 +17,7 @@ class EnsuredNonNullabilityResultExpression
 	public function __construct(
 		Expr $expression,
 		Type $originalType,
-		Type $originalNativeType
+		Type $originalNativeType,
 	)
 	{
 		$this->expression = $expression;

src/Analyser/Error.php

@@ -57,7 +57,7 @@ public function __construct(
 		?int $nodeLine = null,
 		?string $nodeType = null,
 		?string $identifier = null,
-		array $metadata = []
+		array $metadata = [],
 	)
 	{
 		$this->message = $message;

src/Analyser/ExpressionContext.php

@@ -16,7 +16,7 @@ class ExpressionContext
 	private function __construct(
 		bool $isDeep,
 		?string $inAssignRightSideVariableName,
-		?Type $inAssignRightSideType
+		?Type $inAssignRightSideType,
 	)
 	{
 		$this->isDeep = $isDeep;