bug #413 [Maintenance] Fix builds on 1.12 (mpysiak)

This PR was merged into the 1.12 branch. Discussion ---------- Commits ------- 281d1cd Install only Sylius 1.12 on Skeleton 1.12 cc4b47a Limit and refresh the builds 14b6ad7 Switch to panther 82c9968 Remove psalm from builds 6b272e6 Update GA e4b8359 Changes after CR
Sylius · May 10, 2024 · d2befcf · d2befcf
2 parents 4c97122 + e4b8359
commit d2befcf
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,11 +21,10 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "8.1"]
-                symfony: ["5.4.*", "^6.0"]
-                sylius: ["^1.12"]
-                node: ["14.x", "16.x", "18.x"]
-                mysql: ["5.7", "8.0"]
+                php: ["8.1", "8.2", "8.3"]
+                symfony: ["^5.4", "^6.4"]
+                node: ["20.x"]
+                mysql: ["8.0"]
 
         env:
             APP_ENV: test
@@ -46,7 +45,7 @@ jobs:
 
             -
                 name: Setup Node
-                uses: actions/setup-node@v3
+                uses: actions/setup-node@v4
                 with:
                     node-version: "${{ matrix.node }}"
 
@@ -84,7 +83,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 +120,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') }}
@@ -164,10 +163,6 @@ jobs:
                 name: Run PHPStan
                 run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
 
-            -
-                name: Run Psalm
-                run: vendor/bin/psalm
-
             -
                 name: Run PHPSpec
                 run: vendor/bin/phpspec run --ansi -f progress --no-interaction
@@ -178,7 +173,7 @@ jobs:
 
             -
                 name: Run Behat
-                run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
+                run: vendor/bin/behat --colors --strict -vvv --no-interaction -f progress  || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun
 
             -
                 name: Upload Behat logs

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
@@ -9,13 +9,13 @@
     "license": "MIT",
     "require": {
         "php": "^8.0",
-        "sylius/sylius": "^1.12",
-        "sylius/mailer-bundle":  "^1.8 || ^2.0@beta",
+        "sylius/sylius": "~1.12.0",
         "symfony/webpack-encore-bundle": "^1.15"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
         "behat/mink-selenium2-driver": "^1.4",
+        "dbrekelmans/bdi": "^1.1",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
         "friends-of-behat/mink": "^1.8",
@@ -34,14 +34,15 @@
         "phpstan/phpstan-webmozart-assert": "^1.2.0",
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "robertfausk/behat-panther-extension": "^1.1",
         "sylius-labs/coding-standard": "^4.2",
+        "sylius-labs/suite-tags-extension": "^0.1.0",
         "symfony/browser-kit": "^5.4 || ^6.0",
         "symfony/debug-bundle": "^5.4 || ^6.0",
         "symfony/dotenv": "^5.4 || ^6.0",
         "symfony/flex": "^2.2.2",
         "symfony/intl": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
-        "vimeo/psalm": "5.12.0"
+        "symfony/web-profiler-bundle": "^5.4 || ^6.0"
     },
     "conflict": {
         "symfony/framework-bundle": "6.2.8"

diff --git a/features/running_a_sylius_feature.feature b/features/running_a_sylius_feature.feature
@@ -12,7 +12,7 @@ Feature: Adding a new product with associations
         And the store has "LG headphones", "LG earphones", "LG G4" and "LG G5" products
         And I am logged in as an administrator
 
-    @ui @javascript
+    @ui @mink:chromedriver
     Scenario: Adding a new product with associations
         When I want to create a new simple product
         And I specify its code as "lg_g3"
@@ -26,7 +26,7 @@ Feature: Adding a new product with associations
         And this product should also have an association "Alternatives" with products "LG G4" and "LG G5"
         And the product "LG G3" should appear in the store
 
-    @ui @javascript
+    @ui @mink:chromedriver
     Scenario: Adding a new product with associations after changing associated items
         When I want to create a new simple product
         And I specify its code as "lg_g3"

diff --git a/psalm.xml b/psalm.xml
diff --git a/symfony.lock b/symfony.lock
@@ -128,6 +128,15 @@
             "ref": "518ac22defa04a8a1d82479ed362e2921487adf0"
         }
     },
+    "phpstan/phpstan": {
+        "version": "1.10",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "5e490cc197fb6bb1ae22e5abbc531ddc633b6767"
+        }
+    },
     "phpunit/phpunit": {
         "version": "9.6",
         "recipe": {
@@ -305,6 +314,15 @@
             "config/packages/monolog.yaml"
         ]
     },
+    "symfony/panther": {
+        "version": "2.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "673836afb0eac2b0ec36c44f2ff0379e5a4b2177"
+        }
+    },
     "symfony/routing": {
         "version": "6.0",
         "recipe": {