From f549aef53b7e9ab9e35796354b4911be9ccc29be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Thu, 27 Feb 2025 11:27:50 +0100 Subject: [PATCH] Bring back Symfony 6.4 support --- .github/workflows/build.yml | 4 ++-- composer.json | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65bfac56..26ab8a10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: fail-fast: false matrix: php: [ "8.2", "8.3" ] - symfony: [ "^7.1" ] + symfony: [ "^6.4", "^7.1" ] sylius: [ "^2.0" ] node: [ "20.x" ] - mysql: [ "8.0" ] + mysql: [ "8.4" ] env: APP_ENV: test DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}" diff --git a/composer.json b/composer.json index 2846d5bd..b5fab941 100644 --- a/composer.json +++ b/composer.json @@ -7,8 +7,8 @@ "php": "^8.2 || ^8.3", "ext-json": "*", "friendsofsymfony/elastica-bundle": "^6.0", - "sylius/sylius": "~2.0.0", - "symfony/property-access": "^7.1", + "sylius/sylius": "^2.0", + "symfony/property-access": "^6.4 || ^7.1", "symfony/webpack-encore-bundle": "^2.2" }, "require-dev": { @@ -38,15 +38,11 @@ "robertfausk/behat-panther-extension": "^1.1", "sylius-labs/coding-standard": "^4.2", "sylius-labs/suite-tags-extension": "^0.2", - "symfony/browser-kit": "^7.1", - "symfony/debug-bundle": "^7.1", - "symfony/dotenv": "7.1", - "symfony/intl": "^7.1", - "symfony/web-profiler-bundle": "^7.1" - }, - "conflict": { - "api-platform/core": "v2.7.17", - "symfony/framework-bundle": "6.2.8" + "symfony/browser-kit": "^6.4 || ^7.1", + "symfony/debug-bundle": "^6.4 || ^7.1", + "symfony/dotenv": "^6.4 || ^7.1", + "symfony/intl": "^6.4 || ^7.1", + "symfony/web-profiler-bundle": "^6.4 || ^7.1" }, "config": { "sort-packages": true, @@ -54,8 +50,7 @@ "composer/package-versions-deprecated": true, "dealerdirect/phpcodesniffer-composer-installer": true, "php-http/discovery": false, - "phpstan/extension-installer": true, - "symfony/thanks": true + "phpstan/extension-installer": true } }, "extra": {