From 80f45dd7b9b9bd40b47d7ae0a9d84567b468e8d4 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruozzi Date: Mon, 27 May 2024 09:55:32 +0200 Subject: [PATCH] Upgrade for Sylius 1.13 --- .github/workflows/build.yml | 10 +++---- behat.yml.dist | 45 ++++++++++++++++------------ composer.json | 13 ++++---- symfony.lock | 21 +++++++++++++ tests/Application/config/bundles.php | 7 ++++- 5 files changed, 65 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2aa5925..a804e9fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,9 +21,9 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.0", "8.1", "8.2"] + php: ["8.0", "8.1", "8.2", "8.3"] symfony: ["^5.4", "^6.4"] - sylius: ["^1.12.13"] + sylius: ["^1.12.13", "~1.13.0"] node: ["18.x"] mysql: ["8.0"] @@ -51,7 +51,7 @@ jobs: - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "${{ matrix.node }}" @@ -89,7 +89,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') }} @@ -126,7 +126,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') }} diff --git a/behat.yml.dist b/behat.yml.dist index 92d3b071..ca0f3bc3 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -3,11 +3,18 @@ imports: - tests/Behat/Resources/suites.yml default: + formatters: + pretty: + verbose: true + paths: false + snippets: false + gherkin: filters: tags: "~@todo" extensions: DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~ + Robertfausk\Behat\PantherExtension: ~ FriendsOfBehat\MinkDebugExtension: directory: etc/build @@ -18,32 +25,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: @@ -56,3 +61,5 @@ default: FriendsOfBehat\SuiteSettingsExtension: paths: - "features" + + SyliusLabs\SuiteTagsExtension: ~ diff --git a/composer.json b/composer.json index 0276f8ff..387272ed 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,9 @@ "php": "^8.0", "akeneo/api-php-client": "^11", "cocur/slugify": "^4.0", - "guzzlehttp/guzzle": "^6.5", + "guzzlehttp/guzzle": "^6.5 || ^7.6", "http-interop/http-factory-guzzle": "^1.0", - "php-http/guzzle6-adapter": "^2.0", - "sylius/mailer-bundle": "^1.8 || ^2.0", - "sylius/sylius": "^1.12.11", + "sylius/sylius": "^1.12.11 || ^1.13", "symfony/deprecation-contracts": "^2.2", "symfony/lock": "^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15" @@ -23,7 +21,8 @@ "require-dev": { "ext-json": "*", "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.11", @@ -43,9 +42,11 @@ "phpstan/phpstan-doctrine": "^1.3", "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": "^5.4 || ^6.4", "symfony/debug-bundle": "^5.4 || ^6.4", "symfony/dotenv": "^5.4 || ^6.4", diff --git a/symfony.lock b/symfony.lock index 7725201a..1647b290 100644 --- a/symfony.lock +++ b/symfony.lock @@ -348,6 +348,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.4", "recipe": { @@ -444,6 +453,18 @@ "webpack.config.js" ] }, + "symfony/workflow": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.3", + "ref": "3b2f8ca32a07fcb00f899649053943fa3d8bbfb6" + }, + "files": [ + "config/packages/workflow.yaml" + ] + }, "theofidry/alice-data-fixtures": { "version": "1.7", "recipe": { diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php index e434d9e8..3ecbc948 100644 --- a/tests/Application/config/bundles.php +++ b/tests/Application/config/bundles.php @@ -1,6 +1,6 @@ ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], @@ -61,3 +61,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;