From 5d977f200e810a08c50485b8d5ead8d248c62cba Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Fri, 31 Oct 2025 12:18:48 +0100 Subject: [PATCH 1/3] Bump to Sylius 1.14 --- .github/workflows/build.yml | 13 +++++-------- .php-version | 2 +- README.md | 4 ++-- composer.json | 18 +++++------------- symfony.lock | 9 +++++++++ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59ec61b..ddbe66b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,15 +20,15 @@ jobs: matrix: php: [ "8.1", "8.2", "8.3" ] symfony: [ "^5.4", "^6.4" ] - sylius: [ "1.12.16", "1.13.1"] - node: [ "18.x", "20.x" ] + sylius: [ "^1.14"] + node: [ "20.x" ] mysql: [ "8.0" ] env: APP_ENV: test DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -133,9 +133,6 @@ jobs: - name: Run composer-unused run: composer-unused - - name: Validate database schema - run: (cd tests/Application && bin/console doctrine:schema:validate) - - name: Run PHPStan run: vendor/bin/phpstan analyse @@ -152,7 +149,7 @@ jobs: run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun - name: Upload Behat logs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: Behat logs @@ -166,7 +163,7 @@ jobs: PHP_VERSION: 8.2 steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.php-version b/.php-version index cc40bca..2983cad 100644 --- a/.php-version +++ b/.php-version @@ -1 +1 @@ -8.0 +8.2 diff --git a/README.md b/README.md index b3199a6..e4fef84 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ ## Requirements -* PHP `^8.0` -* Sylius `^1.11.2` +* PHP `^8.1` +* Sylius `^1.14` ## Installation diff --git a/composer.json b/composer.json index e4cc22e..5655a50 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "sylius/mailer-bundle": "^1.8 || ^2.0", "sylius/resource": "^1.9", "sylius/resource-bundle": "^1.9", - "sylius/sylius": "^1.12", + "sylius/sylius": "^1.14", "symfony/config": "^5.4 || ^6.0", "symfony/console": "^5.4 || ^6.0", "symfony/dependency-injection": "^5.4 || ^6.0", @@ -73,14 +73,15 @@ "sort-packages": true, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, - "symfony/thanks": true, "phpstan/extension-installer": true, - "symfony/flex": true + "symfony/flex": true, + "symfony/runtime": true, + "symfony/thanks": true } }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.14-dev" }, "symfony": { "require": "^5.4 || ^6.0" @@ -100,15 +101,6 @@ ] }, "scripts": { - "post-install-cmd": [ - "php bin/create_node_symlink.php" - ], - "post-update-cmd": [ - "php bin/create_node_symlink.php" - ], - "post-create-project-cmd": [ - "php bin/create_node_symlink.php" - ], "auto-scripts": { "cache:clear": "symfony-cmd", "assets:install %PUBLIC_DIR%": "symfony-cmd", diff --git a/symfony.lock b/symfony.lock index 0981d25..04ae53b 100644 --- a/symfony.lock +++ b/symfony.lock @@ -25,6 +25,15 @@ "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" } }, + "doctrine/deprecations": { + "version": "1.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.0", + "ref": "87424683adc81d7dc305eefec1fced883084aab9" + } + }, "doctrine/doctrine-bundle": { "version": "2.7", "recipe": { From c401c56a60de57e67121c1ef41b73e816fa08b99 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruozzi Date: Mon, 3 Nov 2025 09:30:14 +0100 Subject: [PATCH 2/3] Temp fix for actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddbe66b..7263fe4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: run: php -v | head -n 1 | awk '{ print $2 }' > .php-version - name: Install certificates - run: symfony server:ca:install + run: symfony server:ca:install || true - name: Run Chrome Headless run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 & From a69e311c6c5ea08a32844cc80f6ef9257edecb07 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruozzi Date: Mon, 3 Nov 2025 09:48:51 +0100 Subject: [PATCH 3/3] Restore test --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7263fe4..07c02f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,6 +133,9 @@ jobs: - name: Run composer-unused run: composer-unused + - name: Validate database schema + run: (cd tests/Application && bin/console doctrine:schema:validate) + - name: Run PHPStan run: vendor/bin/phpstan analyse