Skip to content

Commit d19d1ab

Browse files
Merge branch '6.3' into 6.4
* 6.3: [FrameworkBundle] Don't reference SYMFONY_IDE env var in non-debug mode wire the secret for Symfony 6.4 compatibility
2 parents b69f794 + e88be13 commit d19d1ab

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function getConfigTreeBuilder(): TreeBuilder
107107
->info('Set true to enable support for xsendfile in binary file responses.')
108108
->defaultFalse()
109109
->end()
110-
->scalarNode('ide')->defaultValue('%env(default::SYMFONY_IDE)%')->end()
110+
->scalarNode('ide')->defaultValue($this->debug ? '%env(default::SYMFONY_IDE)%' : null)->end()
111111
->booleanNode('test')->end()
112112
->scalarNode('default_locale')->defaultValue('en')->end()
113113
->booleanNode('set_locale_from_accept_language')

Tests/Functional/ConfigDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function testParametersValuesAreFullyResolved(bool $debug)
141141
$this->assertStringContainsString('locale: en', $tester->getDisplay());
142142
$this->assertStringContainsString('secret: test', $tester->getDisplay());
143143
$this->assertStringContainsString('cookie_httponly: true', $tester->getDisplay());
144-
$this->assertStringContainsString('ide: '.($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null'), $tester->getDisplay());
144+
$this->assertStringContainsString('ide: '.$debug ? ($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null') : 'null', $tester->getDisplay());
145145
}
146146

147147
/**

0 commit comments

Comments
 (0)