From c5f2be07f83c0329a4fc4e63ec8022bb7f37a990 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:40:58 +0200
Subject: [PATCH 1/2] Remove psalm

---
 .github/workflows/build.yml | 15 +++------
 composer.json               |  3 +-
 psalm.xml                   | 66 -------------------------------------
 3 files changed, 6 insertions(+), 78 deletions(-)
 delete mode 100644 psalm.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1b9d0c..55dd062 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: [ 8.1 ]
-                symfony: [ ^5.4, ^6.0 ]
+                symfony: [ ^5.4, ^6.4 ]
 
         steps:
             -
@@ -91,11 +91,6 @@ jobs:
                 run: vendor/bin/ecs check src
                 if: always() && steps.end-of-setup.outcome == 'success'
 
-            -
-                name: Run Psalm
-                run: vendor/bin/psalm --show-info=false --output-format=github
-                if: always() && steps.end-of-setup.outcome == 'success'
-
             -
                 name: Run PHPStan
                 run: vendor/bin/phpstan analyse
@@ -114,7 +109,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: [7.4, 8.0, 8.1, 8.2, 8.3]
-                symfony: [^5.4, ^6.0]
+                symfony: [^5.4, ^6.4]
                 sylius: [~1.10.0, ~1.11.0, ~1.12.0]
                 node: [18.x]
                 mysql: [5.7]
@@ -122,19 +117,19 @@ jobs:
                 exclude:
                     -
                         sylius: ~1.10.0
-                        symfony: ^6.0
+                        symfony: ^6.4
                     -
                         sylius: ~1.11.0
                         php: 7.4
                     -
                         sylius: ~1.11.0
-                        symfony: ^6.0
+                        symfony: ^6.4
                     -
                         sylius: ~1.12.0
                         php: 7.4
                     -
                         php: 7.4
-                        symfony: ^6.0
+                        symfony: ^6.4
 
         env:
             APP_ENV: test
diff --git a/composer.json b/composer.json
index 34c5784..a39ca74 100644
--- a/composer.json
+++ b/composer.json
@@ -42,8 +42,7 @@
         "symfony/intl": "^5.4|^6.0",
         "symfony/runtime": "^5.4|^6.0",
         "symfony/web-profiler-bundle": "^5.4|^6.0",
-        "symfony/webpack-encore-bundle": "^1|^2",
-        "vimeo/psalm": "^5"
+        "symfony/webpack-encore-bundle": "^1|^2"
     },
     "autoload": {
         "psr-4": { "FluxSE\\SyliusPayumStripePlugin\\": "src/" }
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 274b139..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-        errorLevel="1"
-        resolveFromConfigFile="true"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://getpsalm.org/schema/config"
-        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-            <file name="src/DependencyInjection/Configuration.php"/>
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="info">
-                <file name="src/DependencyInjection/Compiler/PayumStoragePaymentAliaser.php"/>
-                <file name="src/DependencyInjection/Compiler/WinzouStateMachineCallbacksModifier.php"/>
-            </errorLevel>
-        </UndefinedDocblockClass>
-        <MixedArgument>
-            <errorLevel type="info">
-                <file name="src/Action/ConvertPaymentAction.php"/>
-                <file name="src/DependencyInjection/FluxSESyliusPayumStripeExtension.php"/>
-            </errorLevel>
-        </MixedArgument>
-
-        <MoreSpecificImplementedParamType>
-            <errorLevel type="info">
-                <directory name="src/Action/"/>
-            </errorLevel>
-        </MoreSpecificImplementedParamType>
-
-        <MixedArrayAccess>
-            <errorLevel type="info">
-                <file name="src/DependencyInjection/FluxSESyliusPayumStripeExtension.php"/>
-            </errorLevel>
-        </MixedArrayAccess>
-
-        <DeprecatedClass>
-            <errorLevel type="info">
-                <file name="src/CommandHandler/AbstractPayumPaymentHandler.php"/>
-            </errorLevel>
-        </DeprecatedClass>
-
-        <DeprecatedMethod>
-            <errorLevel type="info">
-                <file name="src/CommandHandler/AbstractPayumPaymentHandler.php"/>
-            </errorLevel>
-        </DeprecatedMethod>
-
-        <MixedArgumentTypeCoercion>
-            <errorLevel type="info">
-                <file name="src/DependencyInjection/Compiler/PayumStoragePaymentAliaser.php" />
-            </errorLevel>
-        </MixedArgumentTypeCoercion>
-        <DeprecatedInterface>
-            <errorLevel type="info">
-                <file name="src/CommandHandler/AbstractPayumPaymentHandler.php" />
-            </errorLevel>
-        </DeprecatedInterface>
-    </issueHandlers>
-</psalm>

From d87703f81e375df55f104e78b06621ccb96d2f6f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:50:54 +0200
Subject: [PATCH 2/2] Fix not possible build matrix

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55dd062..d400a8d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -130,6 +130,9 @@ jobs:
                     -
                         php: 7.4
                         symfony: ^6.4
+                    -
+                        php: 8.0
+                        symfony: ^6.4
 
         env:
             APP_ENV: test