From d169345a05d5e5d173f7ccef0015cf6203f4a90a Mon Sep 17 00:00:00 2001 From: Fred Date: Mon, 29 Jul 2024 15:39:52 +0200 Subject: [PATCH] chore: sylius 1.13 compatibility --- .github/workflows/recipe.yaml | 6 +++++- Makefile | 2 +- composer.json | 25 +++++++++++-------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml index 6db3fa6..d4231a6 100644 --- a/.github/workflows/recipe.yaml +++ b/.github/workflows/recipe.yaml @@ -17,16 +17,20 @@ jobs: fail-fast: false matrix: php: ['7.4' ,'8.0', '8.1'] - sylius: [ "~1.9.0", "~1.10.0", "~1.11.0", "~1.12.0"] + sylius: [ "~1.9.0", "~1.10.0", "~1.11.0", "~1.12.0", "~1.13.0" ] exclude: - php: 8.1 sylius: "~1.9.0" - php: 8.0 sylius: "~1.9.0" + - php: 8.0 + sylius: "~1.13.0" - php: 7.4 sylius: "~1.11.0" - php: 7.4 sylius: "~1.12.0" + - php: 7.4 + sylius: "~1.13.0" steps: - name: Setup PHP diff --git a/Makefile b/Makefile index 4004253..c15f9cf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL := help SHELL=/bin/bash APP_DIR=tests/Application -SYLIUS_VERSION=1.12.0 +SYLIUS_VERSION=1.13.0 SYMFONY=cd ${APP_DIR} && symfony COMPOSER=symfony composer CONSOLE=${SYMFONY} console diff --git a/composer.json b/composer.json index 8e5cca6..5d1f7bc 100644 --- a/composer.json +++ b/composer.json @@ -5,15 +5,14 @@ "description": "A simple plugin to have sales reports in Sylius", "license": "MIT", "require": { - "php": "~7.4|~8.0", - "sylius/sylius": ">=1.8 <1.13" + "php": ">=7.4 <8.2", + "sylius/sylius": ">=1.8 <1.14" }, "require-dev": { "behat/behat": "^3.6.1", "behat/mink-selenium2-driver": "^1.4", "dmore/behat-chrome-extension": "^1.3", "dmore/chrome-mink-driver": "^2.7", - "doctrine/data-fixtures": "^1.4", "ergebnis/composer-normalize": "^2.5", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", @@ -22,25 +21,23 @@ "friends-of-behat/symfony-extension": "^2.1", "friends-of-behat/variadic-extension": "^1.3", "hwi/oauth-bundle": "^1.1", - "lchrusciel/api-test-case": "^5.0", "matthiasnoback/symfony-config-test": "^4.2", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "mikey179/vfsstream": "^1.6", "mockery/mockery": "^1.4", "pamil/prophecy-common": "^0.1", "phpspec/phpspec": "^6.1 || ^7.2", - "phpstan/phpstan": "^0.12.57", - "phpstan/phpstan-doctrine": "^0.12.19", - "phpstan/phpstan-webmozart-assert": "^0.12.7", + "phpstan/phpstan": "^0.12.57 || ^1.8", + "phpstan/phpstan-doctrine": "^0.12.19 || ^1.3", + "phpstan/phpstan-webmozart-assert": "^0.12.7 || ^1.2", "phpunit/phpunit": "^8.5", - "psalm/plugin-mockery": "^0.3", "psr/event-dispatcher": "^1.0", - "sylius-labs/coding-standard": "^3.1", - "symfony/browser-kit": "^4.4", - "symfony/debug-bundle": "^4.4", - "symfony/dotenv": "^4.4", - "symfony/flex": "^1.7", - "symfony/web-profiler-bundle": "^4.4", + "sylius-labs/coding-standard": "^3.1 || ^4.2", + "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0", + "symfony/debug-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/dotenv": "^4.4 || ^5.4 || ^6.0", + "symfony/flex": "^1.7 || ^2.4", + "symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.0", "phpmd/phpmd": "@stable" }, "prefer-stable": true,