Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 00b927b4948d · 2025-07-30T19:31:35.000+02:00
* 6.4:
  [DependencyInjection] Escape parameters before resolving env placeholders
diff --git a/Tests/TranslatorCacheTest.php b/Tests/TranslatorCacheTest.php
@@ -46,9 +46,9 @@ protected function deleteTmpDir()
                 continue;
             }
             if ($path->isDir()) {
-                rmdir($path->__toString());
+                @rmdir($path->__toString());
             } else {
-                unlink($path->__toString());
+                @unlink($path->__toString());
             }
         }
         rmdir($this->tmpDir);

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ protected function deleteTmpDir()`
`46`	`46`	`continue;`
`47`	`47`	`}`
`48`	`48`	`if ($path->isDir()) {`
`49`		`- rmdir($path->__toString());`
	`49`	`+ @rmdir($path->__toString());`
`50`	`50`	`} else {`
`51`		`- unlink($path->__toString());`
	`51`	`+ @unlink($path->__toString());`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`rmdir($this->tmpDir);`