Skip to content

Commit 0cf7153

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

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
@@ -92,7 +92,7 @@ public function getConfigTreeBuilder(): TreeBuilder
9292
->info('Set true to enable support for xsendfile in binary file responses.')
9393
->defaultFalse()
9494
->end()
95-
->scalarNode('ide')->defaultValue('%env(default::SYMFONY_IDE)%')->end()
95+
->scalarNode('ide')->defaultValue($this->debug ? '%env(default::SYMFONY_IDE)%' : null)->end()
9696
->booleanNode('test')->end()
9797
->scalarNode('default_locale')->defaultValue('en')->end()
9898
->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)