From fa3dd5a6f58835b14b20b05afd493d2b235f9cd7 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 13 Aug 2026 12:59:50 +0200 Subject: [PATCH 1/3] [Maintenance] Prepare for Sylius 2.3 and Symfony 8 --- composer.json | 4 ++-- config/bundles.php | 1 - config/packages/framework.yaml | 2 -- config/packages/property_info.yaml | 3 +++ config/routes/framework.yaml | 2 +- config/routes/web_profiler.yaml | 4 ++-- symfony.lock | 21 +++++++++++++++++++++ 7 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 config/packages/property_info.yaml diff --git a/composer.json b/composer.json index d9a779e..8ab3d91 100644 --- a/composer.json +++ b/composer.json @@ -2,8 +2,8 @@ "name": "sylius/test-application", "license": "MIT", "require": { - "php": "^8.2", - "sylius/sylius": "~2.2.0", + "php": "^8.3", + "sylius/sylius": "~2.3.0@alpha", "symfony/debug-bundle": "*", "symfony/dotenv": "*", "symfony/flex": "*", diff --git a/config/bundles.php b/config/bundles.php index 91a2587..f54cdff 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -28,7 +28,6 @@ Sylius\Bundle\CoreBundle\SyliusCoreBundle::class => ['all' => true], Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true], Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true], - Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true], Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true], diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 252c7de..e6f6990 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -4,8 +4,6 @@ framework: csrf_protection: true session: handler_id: ~ - annotations: - enabled: false when@dev: framework: diff --git a/config/packages/property_info.yaml b/config/packages/property_info.yaml new file mode 100644 index 0000000..dd31b9d --- /dev/null +++ b/config/packages/property_info.yaml @@ -0,0 +1,3 @@ +framework: + property_info: + with_constructor_extractor: true diff --git a/config/routes/framework.yaml b/config/routes/framework.yaml index 0fc74bb..bc1feac 100644 --- a/config/routes/framework.yaml +++ b/config/routes/framework.yaml @@ -1,4 +1,4 @@ when@dev: _errors: - resource: '@FrameworkBundle/Resources/config/routing/errors.xml' + resource: '@FrameworkBundle/Resources/config/routing/errors.php' prefix: /_error diff --git a/config/routes/web_profiler.yaml b/config/routes/web_profiler.yaml index fec9744..523a3cb 100644 --- a/config/routes/web_profiler.yaml +++ b/config/routes/web_profiler.yaml @@ -1,8 +1,8 @@ when@dev: _wdt: - resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' + resource: '@WebProfilerBundle/Resources/config/routing/wdt.php' prefix: /_wdt _profiler: - resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' + resource: '@WebProfilerBundle/Resources/config/routing/profiler.php' prefix: /_profiler diff --git a/symfony.lock b/symfony.lock index 7a6fb65..1e5df64 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": "fdd756167454623e21f1d769c5b814b243782a67" + } + }, "doctrine/doctrine-bundle": { "version": "2.14", "recipe": { @@ -280,6 +289,18 @@ "config/packages/monolog.yaml" ] }, + "symfony/property-info": { + "version": "8.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "7.3", + "ref": "dae70df71978ae9226ae915ffd5fad817f5ca1f7" + }, + "files": [ + "config/packages/property_info.yaml" + ] + }, "symfony/routing": { "version": "7.2", "recipe": { From c0e6ff4f9840fa8a1c80d7771f9f0b82072073a3 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 13 Aug 2026 12:59:55 +0200 Subject: [PATCH 2/3] [Maintenance] Add upmerge from 2.2 to 2.3 --- .github/workflows/upmerge_pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/upmerge_pr.yaml b/.github/workflows/upmerge_pr.yaml index fbab56c..10aecdd 100644 --- a/.github/workflows/upmerge_pr.yaml +++ b/.github/workflows/upmerge_pr.yaml @@ -26,6 +26,9 @@ jobs: - base_branch: "2.1" target_branch: "2.2" + - + base_branch: "2.2" + target_branch: "2.3" steps: - From b0d7a926636d09ba951fdefdcf84b87e697a2f18 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Fri, 14 Aug 2026 13:50:24 +0200 Subject: [PATCH 3/3] Fix track_usage_since DC2Type comment on sylius_promotion_coupon Sylius\Bundle\CoreBundle\Migrations\Version20260616120000 adds the track_usage_since column as plain DATETIME without the COMMENT '(DC2Type:datetime_immutable)' marker, while PromotionCoupon::$trackUsageSince is mapped as datetime_immutable. This makes doctrine:schema:validate report the schema as out of sync right after running migrations, failing all StripePlugin CI test jobs on Sylius ~2.3.0 (see Sylius/StripePlugin#132). --- migrations/Version20260814120000.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 migrations/Version20260814120000.php diff --git a/migrations/Version20260814120000.php b/migrations/Version20260814120000.php new file mode 100644 index 0000000..a82c7bd --- /dev/null +++ b/migrations/Version20260814120000.php @@ -0,0 +1,26 @@ +addSql("ALTER TABLE sylius_promotion_coupon CHANGE track_usage_since track_usage_since DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime_immutable)'"); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE sylius_promotion_coupon CHANGE track_usage_since track_usage_since DATETIME DEFAULT NULL'); + } +}