Skip to content

Commit 64c8b70

Browse files
committed
bug symfony#3279 [CI] Remove usage of framework.annotations.enabled (Kocal)
This PR was merged into the 2.x branch. Discussion ---------- [CI] Remove usage of framework.annotations.enabled | Q | A | -------------- | --- | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md --> | Documentation? | no <!-- required for new features, or documentation updates --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead --> | License | MIT Done in symfony/symfony#61174 Commits ------- 2553328 [CI] Remove usage of framework.annotations.enabled
2 parents 75da64f + 2553328 commit 64c8b70

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

src/LiveComponent/tests/Fixtures/Kernel.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function process(ContainerBuilder $container): void
9090

9191
protected function configureContainer(ContainerConfigurator $c): void
9292
{
93-
$frameworkConfig = [
93+
$c->extension('framework', [
9494
'csrf_protection' => ['enabled' => false],
9595
'secret' => 'S3CRET',
9696
'test' => true,
@@ -106,22 +106,21 @@ protected function configureContainer(ContainerConfigurator $c): void
106106
...(self::VERSION_ID >= 60200 ? [
107107
'handle_all_throwables' => true,
108108
] : []),
109+
...(self::VERSION_ID >= 60400 && self::VERSION_ID < 70400 ? [
110+
'annotations' => ['enabled' => false]
111+
] : []),
112+
...(self::VERSION_ID >= 70300 ? [
113+
'session' => [
114+
'storage_factory_id' => 'session.storage.factory.mock_file',
115+
'cookie_secure' => 'auto',
116+
'cookie_samesite' => 'lax',
117+
'handler_id' => null,
118+
]
119+
] : []),
109120
...(self::VERSION_ID >= 70300 ? [
110121
'property_info' => ['with_constructor_extractor' => false],
111122
] : []),
112-
];
113-
114-
if (self::VERSION_ID >= 60400) {
115-
$frameworkConfig['session'] = [
116-
'storage_factory_id' => 'session.storage.factory.mock_file',
117-
'cookie_secure' => 'auto',
118-
'cookie_samesite' => 'lax',
119-
'handler_id' => null,
120-
];
121-
$frameworkConfig['annotations']['enabled'] = false;
122-
}
123-
124-
$c->extension('framework', $frameworkConfig);
123+
]);
125124

126125
$c->extension('twig', [
127126
'default_path' => '%kernel.project_dir%/tests/Fixtures/templates',

0 commit comments

Comments
 (0)