From 2d0d0a40ac88d08d59be300b913c4c61154b177b Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Mon, 13 Dec 2021 14:17:59 +0100
Subject: [PATCH] Allow for Psalm and ECS to run on all builds

---
 .github/workflows/build.yml | 5 -----
 composer.json               | 2 +-
 easy-coding-standard.yml    | 2 --
 ecs.php                     | 9 +++++++++
 4 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 easy-coding-standard.yml
 create mode 100644 ecs.php

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3b2681..26c3bd7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,10 +39,6 @@ jobs:
             - name: Validate composer.json
               run: composer validate --strict
 
-            - name: Remove analysis dependencies
-              run: composer remove --dev --no-update sylius-labs/coding-standard
-              if: matrix.symfony-version == '6.0.*'
-
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress
               env:
@@ -50,7 +46,6 @@ jobs:
 
             - name: Run coding standard
               run: vendor/bin/ecs check --ansi --no-progress-bar src tests
-              if: matrix.symfony-version != '6.0.*'
 
             - name: Run Psalm
               run: vendor/bin/psalm src --no-progress --php-version="${{ matrix.php-version }}"
diff --git a/composer.json b/composer.json
index a782887..edb2060 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "friends-of-behat/mink-extension": "^2.5",
         "friends-of-behat/page-object-extension": "^0.3.2",
         "friends-of-behat/service-container-extension": "^1.1",
-        "sylius-labs/coding-standard": "^3.2",
+        "sylius-labs/coding-standard": "^4.1.1",
         "symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
         "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
         "symfony/process": "^4.4 || ^5.1 || ^6.0",
diff --git a/easy-coding-standard.yml b/easy-coding-standard.yml
deleted file mode 100644
index 2403599..0000000
--- a/easy-coding-standard.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
-    - { resource: 'vendor/sylius-labs/coding-standard/easy-coding-standard.yml' }
diff --git a/ecs.php b/ecs.php
new file mode 100644
index 0000000..d2c4877
--- /dev/null
+++ b/ecs.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php');
+};