From e8015b6b3360fe32430c53d8ef9b04df2c9e78d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= <lchrusciel@gmail.com>
Date: Tue, 8 Mar 2022 09:49:00 +0100
Subject: [PATCH 1/3] [Maintenance] Fix GH Action to support different Sf
 versions

---
 .github/workflows/build.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79d66f8..61105e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,12 +13,22 @@ on:
 jobs:
     tests:
         runs-on: ubuntu-latest
-        name: "PHP ${{ matrix.php }}"
+        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
         strategy:
             fail-fast: false
             matrix:
-                php: ["7.1", "7.2", "7.3", "7.4", "8.0"]
-                symfony: ["~4.3", "~4.4", "~5.1", "~5.2", "~5.3", "~5.4", "~6.0"]
+                php: ["7.2", "7.3", "7.4", "8.0"]
+                symfony: ["~4.3", "~4.4", "~5.1", "~5.2", "~5.3", "~5.4"]
+
+                include:
+                    -   php: "7.1"
+                        symfony: "~4.3"
+
+                    -   php: "7.1"
+                        symfony: "~4.4"
+
+                    -   php: "8.0"
+                        symfony: "~6.0"
 
         steps:
             -
@@ -35,9 +45,9 @@ jobs:
                 name: Restrict Symfony version
                 if: matrix.symfony != ''
                 run: |
-                    composer require symfony/event-dispatcher:${SYMFONY_VERSION} --no-update --dev
-                    composer require symfony/property-access:${SYMFONY_VERSION} --no-update --dev
-                    composer require symfony/expression-language:${SYMFONY_VERSION} --no-update --dev
+                    composer require symfony/event-dispatcher:"${{ matrix.symfony }}" --no-update --dev
+                    composer require symfony/property-access:"${{ matrix.symfony }}" --no-update --dev
+                    composer require symfony/expression-language:"${{ matrix.symfony }}" --no-update --dev
 
             -
                 name: Install dependencies

From d14e8517eef278a3f3d0a663e6ef26f9a78f7a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= <lchrusciel@gmail.com>
Date: Tue, 8 Mar 2022 11:31:16 +0100
Subject: [PATCH 2/3] [Maintenance] Introduce usage of phpspec fork (for
 support of PHP 8.1 and Sf 6.0)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0bd45d0..8528a7e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "symfony/framework-bundle": "^4.3|^5.0|^6.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "^5.0|^6.0|^7.0"
+        "sylius/phpspec": "^5.0|^6.0|^7.0"
     },
     "autoload": {
         "psr-4": { "winzou\\Bundle\\StateMachineBundle\\": "" }

From a78d8e21c1ba97f4c4cd819c95bde4ef6117b69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= <lchrusciel@gmail.com>
Date: Tue, 8 Mar 2022 11:36:48 +0100
Subject: [PATCH 3/3] [GH] Add builds for PHP 8.1

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61105e6..5043aa7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["7.2", "7.3", "7.4", "8.0"]
+                php: ["7.2", "7.3", "7.4", "8.0", "8.1"]
                 symfony: ["~4.3", "~4.4", "~5.1", "~5.2", "~5.3", "~5.4"]
 
                 include:
@@ -30,6 +30,9 @@ jobs:
                     -   php: "8.0"
                         symfony: "~6.0"
 
+                    -   php: "8.1"
+                        symfony: "~6.0"
+
         steps:
             -
                 uses: actions/checkout@v2