minor #61393 Fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 78e6eacdb0ca · 2025-08-12T18:43:03.000+02:00
This PR was merged into the 7.4 branch. Discussion ---------- Fix tests | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | no | New feature? | | Deprecations? | no | Issues | - | License | MIT Commits ------- 1aae37a Fix tests
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
@@ -58,7 +58,9 @@ protected function getExtensions(): array
 
     protected function tearDown(): void
     {
-        \Locale::setDefault($this->defaultLocale);
+        if (isset($this->defaultLocale)) {
+            \Locale::setDefault($this->defaultLocale);
+        }
     }
 
     protected function assertWidgetMatchesXpath(FormView $view, array $vars, $xpath)
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -403,7 +403,7 @@ private function convertParameters(array $parameters, string $type, string $keyA
 
     private function encode(string $value, int $flags = \ENT_COMPAT): string
     {
-        return htmlspecialchars($value, \ENT_XML1 | \ENT_SUBSTITUTE | $flags, 'UTF-8');
+        return str_replace("\r", '&#13;', htmlspecialchars($value, \ENT_XML1 | \ENT_SUBSTITUTE | $flags, 'UTF-8'));
     }
 
     private function escape(array $arguments): array
diff --git a/src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php b/src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php
@@ -51,10 +51,10 @@ public function testCrossCheck($fixture, $type)
 
         unlink($tmp);
 
-        $this->assertEquals($container2->getAliases(), $container1->getAliases(), 'loading a dump from a previously loaded container returns the same container');
-        $this->assertEquals($container2->getDefinitions(), $container1->getDefinitions(), 'loading a dump from a previously loaded container returns the same container');
-        $this->assertEquals($container2->getParameterBag()->all(), $container1->getParameterBag()->all(), '->getParameterBag() returns the same value for both containers');
-        $this->assertEquals(serialize($container2), serialize($container1), 'loading a dump from a previously loaded container returns the same container');
+        $this->assertEquals($container1->getAliases(), $container2->getAliases(), 'loading a dump from a previously loaded container returns the same container');
+        $this->assertEquals($container1->getDefinitions(), $container2->getDefinitions(), 'loading a dump from a previously loaded container returns the same container');
+        $this->assertEquals($container1->getParameterBag()->all(), $container2->getParameterBag()->all(), '->getParameterBag() returns the same value for both containers');
+        $this->assertEquals(serialize($container1), serialize($container2), 'loading a dump from a previously loaded container returns the same container');
 
         $services1 = [];
         foreach ($container1 as $id => $service) {
@@ -67,7 +67,7 @@ public function testCrossCheck($fixture, $type)
 
         unset($services1['service_container'], $services2['service_container']);
 
-        $this->assertEquals($services2, $services1, 'Iterator on the containers returns the same services');
+        $this->assertEquals($services1, $services2, 'Iterator on the containers returns the same services');
     }
 
     public static function crossCheckLoadersDumpers()
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -97,7 +97,7 @@ protected function tearDown(): void
     {
         $this->restoreDefaultTimezone();
 
-        if (class_exists(\Locale::class)) {
+        if (class_exists(\Locale::class) && isset($this->defaultLocale)) {
             \Locale::setDefault($this->defaultLocale);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@ protected function getExtensions(): array`
`58`	`58`
`59`	`59`	`protected function tearDown(): void`
`60`	`60`	`{`
`61`		`- \Locale::setDefault($this->defaultLocale);`
	`61`	`+ if (isset($this->defaultLocale)) {`
	`62`	`+ \Locale::setDefault($this->defaultLocale);`
	`63`	`+ }`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`protected function assertWidgetMatchesXpath(FormView $view, array $vars, $xpath)`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ private function convertParameters(array $parameters, string $type, string $keyA`
`403`	`403`
`404`	`404`	`private function encode(string $value, int $flags = \ENT_COMPAT): string`
`405`	`405`	`{`
`406`		`- return htmlspecialchars($value, \ENT_XML1 \| \ENT_SUBSTITUTE \| $flags, 'UTF-8');`
	`406`	`+ return str_replace("\r", ' ', htmlspecialchars($value, \ENT_XML1 \| \ENT_SUBSTITUTE \| $flags, 'UTF-8'));`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`private function escape(array $arguments): array`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ protected function tearDown(): void`
`97`	`97`	`{`
`98`	`98`	`$this->restoreDefaultTimezone();`
`99`	`99`
`100`		`- if (class_exists(\Locale::class)) {`
	`100`	`+ if (class_exists(\Locale::class) && isset($this->defaultLocale)) {`
`101`	`101`	`\Locale::setDefault($this->defaultLocale);`
`102`	`102`	`}`
`103`	`103`	`}`