Add newest PHP version to the build and remove Sylius 1.9

FLUX-SE · Jan 4, 2024 · a6ee2f4 · a6ee2f4
1 parent 439c472
commit a6ee2f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ 8.0 ]
+                php: [ 8.1 ]
                 symfony: [ ^5.4, ^6.0 ]
 
         steps:
@@ -108,40 +108,25 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0]
+                php: [7.4, 8.0, 8.1, 8.2, 8.3]
                 symfony: [^5.4, ^6.0]
-                sylius: [~1.9.0, ~1.10.0, ~1.11.0, ~1.12.0]
+                sylius: [~1.10.0, ~1.11.0, ~1.12.0]
                 node: [18.x]
                 mysql: [5.7]
 
                 exclude:
-                    -
-                        sylius: ~1.9.0
-                        php: 8.0
-                    -
-                        sylius: ~1.10.0
-                        php: 7.3
                     -
                         sylius: ~1.10.0
                         symfony: ^6.0
-                    -
-                        sylius: ~1.11.0
-                        php: 7.3
                     -
                         sylius: ~1.11.0
                         php: 7.4
                     -
                         sylius: ~1.11.0
                         symfony: ^6.0
-                    -
-                        sylius: ~1.12.0
-                        php: 7.3
                     -
                         sylius: ~1.12.0
                         php: 7.4
-                    -
-                        php: 7.3
-                        symfony: ^6.0
                     -
                         php: 7.4
                         symfony: ^6.0
@@ -220,14 +205,6 @@ jobs:
                 if: matrix.sylius != ''
                 run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
 
-            -
-                name: Fix build on Sylius 1.9
-                if: matrix.sylius == '~1.9.0'
-                run: |
-                    composer require "friendsofsymfony/oauth-server-bundle:>2.0.0-alpha.0 ^2.0@dev" --no-update --no-scripts --no-interaction
-                    # Sylius issues on `json_array` type not existing
-                    composer require "doctrine/dbal:^2.6" --no-update --no-scripts --no-interaction
-                    composer require "nyholm/psr7" --no-update --no-scripts --no-interaction
             -
                 name: Fix build on Sylius 1.10
                 if: matrix.sylius == '~1.10.0'

diff --git a/composer.json b/composer.json
@@ -28,10 +28,10 @@
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
         "phpspec/phpspec": "^7.0",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan-doctrine": "^1",
-        "phpstan/phpstan-strict-rules": "^1",
-        "phpstan/phpstan-webmozart-assert": "^1",
+        "phpstan/extension-installer": "^1.0",
+        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/coding-standard": "^4.0",
@@ -42,8 +42,8 @@
         "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.16",
-        "vimeo/psalm": "^4|^5"
+        "symfony/webpack-encore-bundle": "^1|^2",
+        "vimeo/psalm": "^5"
     },
     "autoload": {
         "psr-4": { "FluxSE\\SyliusPayumStripePlugin\\": "src/" }