From 991f11cdf21d2bf9de5b4ec0fde8848dcc91693b Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sat, 25 Jan 2025 01:22:43 +0100
Subject: [PATCH] Remove legacy PHP-CS-Fixer rule configuration

---
 .php-cs-fixer.dist.php                      | 11 -----------
 src/Command/Import/ImportCommand.php        |  2 +-
 src/Consumer/RabbitMQConsumerTotalProxy.php |  2 +-
 src/Controller/Api/EntryRestController.php  |  2 +-
 src/Controller/ConfigController.php         |  2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 73bc89296..e9e8e70f1 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -37,17 +37,6 @@ return $config
         // 'psr_autoloading' => true,
         'strict_comparison' => true,
         'strict_param' => true,
-        // We override next rule because of current @Symfony ruleSet
-        // 'parameters' element is breaking PHP 7.4
-        // https://cs.symfony.com/doc/rules/control_structure/trailing_comma_in_multiline.html
-        // TODO: remove this configuration after dropping support of PHP 7.4
-        'trailing_comma_in_multiline' => [
-            'elements' => [
-                'arrays',
-                'array_destructuring',
-                'match',
-            ],
-        ],
         'concat_space' => [
             'spacing' => 'one',
         ],
diff --git a/src/Command/Import/ImportCommand.php b/src/Command/Import/ImportCommand.php
index 44c3ba6d4..0005797a5 100644
--- a/src/Command/Import/ImportCommand.php
+++ b/src/Command/Import/ImportCommand.php
@@ -64,7 +64,7 @@ class ImportCommand extends Command
         ElcuratorImport $elcuratorImport,
         ShaarliImport $shaarliImport,
         PocketHtmlImport $pocketHtmlImport,
-        OmnivoreImport $omnivoreImport
+        OmnivoreImport $omnivoreImport,
     ) {
         $this->entityManager = $entityManager;
         $this->tokenStorage = $tokenStorage;
diff --git a/src/Consumer/RabbitMQConsumerTotalProxy.php b/src/Consumer/RabbitMQConsumerTotalProxy.php
index bb2f45acd..4cce92c1b 100644
--- a/src/Consumer/RabbitMQConsumerTotalProxy.php
+++ b/src/Consumer/RabbitMQConsumerTotalProxy.php
@@ -37,7 +37,7 @@ class RabbitMQConsumerTotalProxy
         Consumer $elcuratorConsumer,
         Consumer $shaarliConsumer,
         Consumer $pocketHtmlConsumer,
-        Consumer $omnivoreConsumer
+        Consumer $omnivoreConsumer,
     ) {
         $this->pocketConsumer = $pocketConsumer;
         $this->readabilityConsumer = $readabilityConsumer;
diff --git a/src/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php
index da43f42a6..dedc2d14d 100644
--- a/src/Controller/Api/EntryRestController.php
+++ b/src/Controller/Api/EntryRestController.php
@@ -724,7 +724,7 @@ class EntryRestController extends WallabagRestController
         LoggerInterface $logger,
         TagsAssigner $tagsAssigner,
         EventDispatcherInterface $eventDispatcher,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
     ) {
         $this->validateAuthentication();
 
diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php
index 9ab95bb8c..71b095447 100644
--- a/src/Controller/ConfigController.php
+++ b/src/Controller/ConfigController.php
@@ -61,7 +61,7 @@ class ConfigController extends AbstractController
         AnnotationRepository $annotationRepository,
         ConfigRepository $configRepository,
         EventDispatcherInterface $eventDispatcher,
-        Redirect $redirectHelper
+        Redirect $redirectHelper,
     ) {
         $this->entityManager = $entityManager;
         $this->userManager = $userManager;