From 8b5883a782500ff8dff2351744f8e4a7029d6b46 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 12 Oct 2022 10:54:25 +0200
Subject: [PATCH] Update ECS config

---
 ecs.php                             | 28 ++++++++++------------------
 src/Action/CancelAction.php         |  4 ++--
 src/Action/ConvertPaymentAction.php |  6 +++---
 src/Action/RefundAction.php         |  4 ++--
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/ecs.php b/ecs.php
index d48d713..01e1ef5 100644
--- a/ecs.php
+++ b/ecs.php
@@ -2,25 +2,17 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
-use PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php');
+return static function (ECSConfig $config): void {
+    $config->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php');
 
-    $services = $containerConfigurator->services();
-    /**
-     * Was added to fix this exception:
-     *
-     * PhpCsFixer\ConfigurationException\InvalidFixerConfigurationException: [binary_operator_spaces] Invalid configuration:
-     * The options "align_double_arrow", "align_equals" do not exist. Defined options are: "default", "operators".
-     * in vendor/friendsofphp/php-cs-fixer/src/AbstractFixer.php on line 155
-     */
-    $services->set(BinaryOperatorSpacesFixer::class);
+    $services = $config->services();
 
-    /**
-     * Miss configured fixer into sylius-labs/coding-standard v4.1.0
-     */
-    $services->set(ClassAttributesSeparationFixer::class);
+    // PHP 7 compatibility
+    $services
+        ->set(TrailingCommaInMultilineFixer::class)
+        ->call('configure', [['elements' => ['arrays']]])
+    ;
 };
diff --git a/src/Action/CancelAction.php b/src/Action/CancelAction.php
index 616d549..f69aa10 100644
--- a/src/Action/CancelAction.php
+++ b/src/Action/CancelAction.php
@@ -32,7 +32,7 @@ public function execute($request): void
 
     public function supports($request): bool
     {
-        return $request instanceof Cancel
-            && $request->getModel() instanceof ArrayAccess;
+        return $request instanceof Cancel &&
+            $request->getModel() instanceof ArrayAccess;
     }
 }
diff --git a/src/Action/ConvertPaymentAction.php b/src/Action/ConvertPaymentAction.php
index 98f5d5a..5e658d2 100644
--- a/src/Action/ConvertPaymentAction.php
+++ b/src/Action/ConvertPaymentAction.php
@@ -114,8 +114,8 @@ private function setEmail(ArrayObject $model, PaymentInterface $payment): void
 
     public function supports($request): bool
     {
-        return $request instanceof Convert
-            && $request->getSource() instanceof PaymentInterface
-            && $request->getTo() == 'array';
+        return $request instanceof Convert &&
+            $request->getSource() instanceof PaymentInterface &&
+            $request->getTo() == 'array';
     }
 }
diff --git a/src/Action/RefundAction.php b/src/Action/RefundAction.php
index 29ca62c..81cf2f9 100644
--- a/src/Action/RefundAction.php
+++ b/src/Action/RefundAction.php
@@ -31,7 +31,7 @@ public function execute($request): void
 
     public function supports($request): bool
     {
-        return $request instanceof Refund
-            && $request->getModel() instanceof \ArrayAccess;
+        return $request instanceof Refund &&
+            $request->getModel() instanceof \ArrayAccess;
     }
 }