8000 fix ci · symfony/symfony@b5bba1a · GitHub
[go: up one dir, main page]
Skip to content

Commit b5bba1a

Browse files
Jean-BeruJean-Beru
committed
fix ci
1 parent c2da88f commit b5bba1a

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,15 +1287,15 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode): void
12871287
{
12881288
$rootNode
12891289
->validate()
1290-
->always(function (array $v): array {
1291-
if (!array_key_exists('log', $v['php_errors'])) {
1292-
trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.');
1290+
->always(function (array $v): array {
1291+
if (!array_key_exists('log', $v['php_errors'])) {
1292+
trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.');
12931293

1294-
$v['php_errors']['log'] = $this->debug;
1295-
}
1294+
$v['php_errors']['log'] = $this->debug;
1295+
}
12961296

1297-
return $v;
1298-
})
1297+
return $v;
1298+
})
12991299
->end()
13001300
->children()
13011301
->arrayNode('php_errors')

‎src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,20 @@ public function registerBundles(): iterable
6262
public function registerContainerConfiguration(LoaderInterface $loader): void
6363
{
6464
$loader->load(function (ContainerBuilder $container) {
65+
$config = [
66+
'annotations' => false,
67+
'http_method_override' => false,
68+
'php_errors' => ['log' => true],
69+
'secret' => '$ecret',
70+
'form' => ['enabled' => false],
71+
];
72+
73+
if (Kernel::VERSION_ID >= 60400) {
74+
$config['handle_all_throwables'] = true;
75+
}
76+
6577
$container
66-
->loadFromExtension('framework', [
67-
'annotations' => false,
68-
'http_method_override' => false,
69-
'handle_all_throwables' => true,
70-
'php_errors' => ['log' => true],
71-
'secret' => '$ecret',
72-
'form' => ['enabled' => false],
73-
])
78+
->loadFromExtension('framework', $config)
7479
->loadFromExtension('twig', [
7580
'default_path' => __DIR__.'/templates',
7681
])

‎src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
5353
$config = [
5454
'annotations' => false,
5555
'http_method_override' => false,
56-
'handle_all_throwables' => true,
5756
'php_errors' => ['log' => true],
5857
'secret' => 'foo-secret',
5958
'profiler' => ['only_exceptions' => false],
6059
'session' => ['storage_factory_id' => 'session.storage.factory.mock_file', 'cookie-secure' => 'auto', 'cookie-samesite' => 'lax'],
6160
'router' => ['utf8' => true],
6261
];
6362

63+
if (Kernel::VERSION_ID >= 60400) {
64+
$config['handle_all_throwables'] = true;
65+
}
66+
6467
$container->loadFromExtension('framework', $config);
6568

6669
$container->loadFromExtension('web_profiler', [

0 commit comments

Comments
 (0)
0