From ac4184226f66c66391a6e717c90d7d24eacc0354 Mon Sep 17 00:00:00 2001 From: Francis Hilaire Date: Thu, 19 Dec 2024 20:46:03 +0100 Subject: [PATCH] Add Sylius 2.0 requirements --- .github/workflows/build.yml | 46 ++++++------------------------------- composer.json | 16 ++++++------- ecs.php | 16 +++++-------- 3 files changed, 21 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4053484..6307152 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.0 ] - symfony: [ ^5.4, ^6.0 ] + php: [ 8.2 ] + symfony: [ ^6.4, ^7.1 ] steps: - @@ -108,43 +108,11 @@ jobs: strategy: fail-fast: false matrix: - php: [7.3, 7.4, 8.0] - symfony: [^5.4, ^6.0] - sylius: [~1.9.0, ~1.10.0, ~1.11.0, ~1.12.0] - node: [18.x] - mysql: [5.7] - - exclude: - - - sylius: ~1.9.0 - php: 8.0 - - - sylius: ~1.10.0 - php: 7.3 - - - sylius: ~1.10.0 - symfony: ^6.0 - - - sylius: ~1.11.0 - php: 7.3 - - - sylius: ~1.11.0 - php: 7.4 - - - sylius: ~1.11.0 - symfony: ^6.0 - - - sylius: ~1.12.0 - php: 7.3 - - - sylius: ~1.12.0 - php: 7.4 - - - php: 7.3 - symfony: ^6.0 - - - php: 7.4 - symfony: ^6.0 + php: [8.2, 8.3] + symfony: [^6.4, ^7.1] + sylius: [~2.0.0] + node: [20.x] + mysql: [8] env: APP_ENV: test diff --git a/composer.json b/composer.json index 4f435cf..3b1e749 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "sylius/sylius": "^1.4", + "sylius/sylius": "^2.0", "meteo-concept/hcaptcha-bundle": ">=2" }, "require-dev": { @@ -35,13 +35,13 @@ "polishsymfonycommunity/symfony-mocker-container": "^1.0", "robertfausk/behat-panther-extension": "^1.1", "sylius-labs/coding-standard": "^4.0", - "symfony/browser-kit": "^5.4|^6.0", - "symfony/debug-bundle": "^5.4|^6.0", - "symfony/dotenv": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", - "symfony/runtime": "^5.4|^6.0", - "symfony/web-profiler-bundle": "^5.4|^6.0", + "symfony/browser-kit": "^6.4 || ^7.1", + "symfony/debug-bundle": "^6.4 || ^7.1", + "symfony/dotenv": "^6.4 || ^7.1", + "symfony/http-client": "^6.4 || ^7.1", + "symfony/intl": "^6.4 || ^7.1", + "symfony/runtime": "^6.4 || ^7.1", + "symfony/web-profiler-bundle": "^6.4 || ^7.1", "symfony/webpack-encore-bundle": "^1.16", "vimeo/psalm": "^4|^5", "dbrekelmans/bdi": "^1.0" diff --git a/ecs.php b/ecs.php index cd3d17f..30e27f2 100644 --- a/ecs.php +++ b/ecs.php @@ -5,14 +5,10 @@ use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer; use Symplify\EasyCodingStandard\Config\ECSConfig; -return static function (ECSConfig $ecsConfig): void { - $ecsConfig->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php'); - - $services = $ecsConfig->services(); - - // PHP 7 compatibility - $services - ->set(TrailingCommaInMultilineFixer::class) - ->call('configure', [['elements' => ['arrays']]]) - ; +return static function (ECSConfig $config): void { + $config->import('vendor/sylius-labs/coding-standard/ecs.php'); + $config->paths([ + 'src', + 'tests', + ]); };