Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit f446f92ea2c2 · 2025-08-04T09:07:07.000+02:00
* 6.4:
  Fix tests sensitive to SYMFONY_IDE env var
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -141,7 +141,7 @@ public function testParametersValuesAreFullyResolved(bool $debug)
         $this->assertStringContainsString('locale: en', $tester->getDisplay());
         $this->assertStringContainsString('secret: test', $tester->getDisplay());
         $this->assertStringContainsString('cookie_httponly: true', $tester->getDisplay());
-        $this->assertStringContainsString('ide: '.$debug ? ($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null') : 'null', $tester->getDisplay());
+        $this->assertStringContainsString('ide: '.($debug ? ($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null') : 'null'), $tester->getDisplay());
     }
 
     /**
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/ContextualizedDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/ContextualizedDumperTest.php
@@ -19,16 +19,19 @@
 
 /**
  * @author Kévin Thérage <therage.kevin@gmail.com>
+ *
+ * @backupGlobals
  */
 class ContextualizedDumperTest extends TestCase
 {
     public function testContextualizedCliDumper()
     {
+        $_ENV['SYMFONY_IDE'] = $_SERVER['SYMFONY_IDE'] = '';
         $wrappedDumper = new CliDumper('php://output');
         $wrappedDumper->setColors(true);
 
         $var = 'example';
-        $href = \sprintf('file://%s#L%s', __FILE__, 37);
+        $href = \sprintf('file://%s#L%s', __FILE__, 40);
         $dumper = new ContextualizedDumper($wrappedDumper, [new SourceContextProvider()]);
         $cloner = new VarCloner();
         $data = $cloner->cloneVar($var);

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function testParametersValuesAreFullyResolved(bool $debug)`
`141`	`141`	`$this->assertStringContainsString('locale: en', $tester->getDisplay());`
`142`	`142`	`$this->assertStringContainsString('secret: test', $tester->getDisplay());`
`143`	`143`	`$this->assertStringContainsString('cookie_httponly: true', $tester->getDisplay());`
`144`		`- $this->assertStringContainsString('ide: '.$debug ? ($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null') : 'null', $tester->getDisplay());`
	`144`	`+ $this->assertStringContainsString('ide: '.($debug ? ($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null') : 'null'), $tester->getDisplay());`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`