Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/upmerge_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
-
base_branch: "2.1"
target_branch: "2.2"
-
base_branch: "2.2"
target_branch: "2.3"

steps:
-
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
1 change: 0 additions & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 0 additions & 2 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ framework:
csrf_protection: true
session:
handler_id: ~
annotations:
enabled: false

when@dev:
framework:
Expand Down
3 changes: 3 additions & 0 deletions config/packages/property_info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
property_info:
with_constructor_extractor: true
2 changes: 1 addition & 1 deletion config/routes/framework.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
when@dev:
_errors:
resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
resource: '@FrameworkBundle/Resources/config/routing/errors.php'
prefix: /_error
4 changes: 2 additions & 2 deletions config/routes/web_profiler.yaml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions migrations/Version20260814120000.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace App\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20260814120000 extends AbstractMigration
{
public function getDescription(): string
{
return 'Fix track_usage_since column type comment on sylius_promotion_coupon (Sylius\Bundle\CoreBundle\Migrations\Version20260616120000 created it without the datetime_immutable DC2Type marker, causing doctrine:schema:validate to report a mismatch).';
}

public function up(Schema $schema): void
{
$this->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');
}
}
21 changes: 21 additions & 0 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down