From 7347d95b52fc7411585ca75c4f6ad90e9b518864 Mon Sep 17 00:00:00 2001
From: Rafikooo <thecrazyrafik@gmail.com>
Date: Thu, 8 Feb 2024 11:19:20 +0100
Subject: [PATCH 1/2] [Conflict] Add conflict with
 behat/mink-selenium2-driver:>=1.7.0

---
 CONFLICTS.md  | 10 ++++++++++
 composer.json |  3 +++
 2 files changed, 13 insertions(+)
 create mode 100644 CONFLICTS.md

diff --git a/CONFLICTS.md b/CONFLICTS.md
new file mode 100644
index 00000000..06d5f13a
--- /dev/null
+++ b/CONFLICTS.md
@@ -0,0 +1,10 @@
+# CONFLICTS
+
+This document explains why certain conflicts were added to `composer.json` and
+references related issues.
+
+- `behat/mink-selenium2-driver:>=1.7.0`:
+
+  This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method
+  which causes a fatal error because the method signature is no longer compatible with the parent class:
+  `PHP Fatal error:  Declaration of Behat\Mink\Driver\Selenium2Driver::visit(string $url) must be compatible with Behat\Mink\Driver\CoreDriver::visit($url) in /home/runner/work/Sylius-Standard/Sylius-Standard/vendor/behat/mink-selenium2-driver/src/Selenium2Driver.php on line 401`
diff --git a/composer.json b/composer.json
index 6f1c2e35..2bd8f17f 100644
--- a/composer.json
+++ b/composer.json
@@ -50,6 +50,9 @@
     "autoload-dev": {
         "classmap": ["tests/Application/Kernel.php"]
     },
+    "conflict": {
+        "behat/mink-selenium2-driver": ">=1.7.0"
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {

From bea250530e1481c3ad5a121df21f88079e93d739 Mon Sep 17 00:00:00 2001
From: Rafikooo <thecrazyrafik@gmail.com>
Date: Mon, 12 Feb 2024 17:12:08 +0100
Subject: [PATCH 2/2] [CI] Bump version of symfony/flex to ^2.4

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index faa073c6..53fe8f2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,7 @@ jobs:
                 if: matrix.symfony != ''
                 run: |
                     composer global config --no-plugins allow-plugins.symfony/flex true
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4"
                     composer config --no-plugins allow-plugins.symfony/thanks true
                     composer config extra.symfony.require "${{ matrix.symfony }}"