Upgrade for Sylius 1.13

webgriffe · May 20, 2024 · c617704 · c617704
1 parent c9cf0d7
commit c617704
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,16 +16,16 @@ jobs:
     tests:
         runs-on: ubuntu-latest
 
-        name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}"
+        name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }} Node ${{ matrix.node }}"
 
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.1", "8.2" ]
+                php: [ "8.1", "8.2", "8.3" ]
+                sylius: [ "~1.12.0", "~1.13.0" ]
                 symfony: [ "^6.4" ]
-                sylius: [ "^1.12" ]
-                node: [ "18.x" ]
-                mysql: [ "5.7", "8.0" ]
+                node: [ "20.x" ]
+                mysql: [ "8.0" ]
 
         env:
             APP_ENV: test
@@ -46,7 +46,7 @@ jobs:
 
             -
                 name: Setup Node
-                uses: actions/setup-node@v3
+                uses: actions/setup-node@v4
                 with:
                     node-version: "${{ matrix.node }}"
 
@@ -84,7 +84,7 @@ jobs:
 
             -
                 name: Cache Composer
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
@@ -121,7 +121,7 @@ jobs:
 
             -
                 name: Cache Yarn
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.yarn-cache.outputs.dir }}
                     key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
@@ -153,6 +153,10 @@ jobs:
                 name: Load fixtures in test application
                 run: (cd tests/Application && bin/console sylius:fixtures:load -n)
 
+            -
+                name: Validate composer.json
+                run: composer validate --ansi --strict
+
             -
                 name: Validate database schema
                 run: (cd tests/Application && bin/console doctrine:schema:validate)

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -3,8 +3,15 @@ imports:
     - tests/Behat/Resources/suites.yml
 
 default:
+    formatters:
+        pretty:
+            verbose: true
+            paths: false
+            snippets: false
+
     extensions:
         DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
+        Robertfausk\Behat\PantherExtension: ~
 
         FriendsOfBehat\MinkDebugExtension:
             directory: etc/build
@@ -15,32 +22,30 @@ default:
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
             base_url: "https://127.0.0.1:8080/"
             default_session: symfony
-            javascript_session: chrome_headless
+            javascript_session: panther
             sessions:
                 symfony:
                     symfony: ~
-                chrome_headless:
+                chromedriver:
                     chrome:
                         api_url: http://127.0.0.1:9222
                         validate_certificate: false
-                chrome:
-                    selenium2:
-                        browser: chrome
-                        capabilities:
-                            browserName: chrome
-                            browser: chrome
-                            version: ""
-                            marionette: null # https://github.com/Behat/MinkExtension/pull/311
-                            chrome:
-                                switches:
-                                    - "start-fullscreen"
-                                    - "start-maximized"
-                                    - "no-sandbox"
-                            extra_capabilities:
+                chrome_headless_second_session:
+                    chrome:
+                        api_url: http://127.0.0.1:9222
+                        validate_certificate: false
+                panther:
+                    panther:
+                        manager_options:
+                            connection_timeout_in_ms: 5000
+                            request_timeout_in_ms: 120000
+                            chromedriver_arguments:
+                                - --log-path=etc/build/chromedriver.log
+                                - --verbose
+                            capabilities:
+                                acceptSslCerts: true
+                                acceptInsecureCerts: true
                                 unexpectedAlertBehaviour: accept
-                firefox:
-                    selenium2:
-                        browser: firefox
             show_auto: false
 
         FriendsOfBehat\SymfonyExtension:
@@ -53,3 +58,5 @@ default:
         FriendsOfBehat\SuiteSettingsExtension:
             paths:
                 - "features"
+
+        SyliusLabs\SuiteTagsExtension: ~
diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
         "guzzlehttp/psr7": "^1.9",
         "php-http/discovery": "^1.19",
         "psr/http-factory": "^1.0",
-        "sylius/mailer-bundle": "^2.0",
-        "sylius/sylius": "^1.12",
+        "sylius/sylius": "^1.12 || ^1.13",
         "symfony/webpack-encore-bundle": "^1.17"
     },
     "require-dev": {
         "behat/behat": "^3.14",
-        "behat/mink-selenium2-driver": "1.6",
+        "behat/mink-selenium2-driver": "^1.6",
+        "dbrekelmans/bdi": "^1.1",
         "dmore/behat-chrome-extension": "^1.4",
         "dmore/chrome-mink-driver": "^2.9",
         "friends-of-behat/mink": "^1.10",
@@ -33,12 +33,14 @@
         "phpspec/phpspec": "^7.5",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-doctrine": "1.3.69",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpstan/phpstan-webmozart-assert": "^1.2",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "robertfausk/behat-panther-extension": "^1.1",
         "sylius-labs/coding-standard": "^4.3",
+        "sylius-labs/suite-tags-extension": "^0.2",
         "symfony/browser-kit": "^6.4",
         "symfony/debug-bundle": "^6.4",
         "symfony/dotenv": "^6.4",

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,7 +1,6 @@
 parameters:
     level: max
     reportUnmatchedIgnoredErrors: false
-    checkMissingIterableValueType: false
     paths:
         - src
         - tests/Behat
@@ -15,4 +14,5 @@ parameters:
         - 'tests/Application/src/**.php'
 
     ignoreErrors:
-        - '/Parameter #1 \$configuration of method Symfony\\Component\\DependencyInjection\\Extension\\Extension::processConfiguration\(\) expects Symfony\\Component\\Config\\Definition\\ConfigurationInterface, Symfony\\Component\\Config\\Definition\\ConfigurationInterface\|null given\./'
+        -
+            identifier: missingType.iterableValue
diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -1,6 +1,6 @@
 <?php
 
-return [
+$bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -59,3 +59,8 @@
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
 ];
+if (class_exists(Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class)) {
+    $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class] = ['all' => true];
+}
+
+return $bundles;