Skip to content

Commit 634ca9c

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Scheduler] Save checkpoint in a finally block DX: re-apply concat_space [PhpUnitBridge] Allow setting the locale using SYMFONY_PHPUNIT_LOCALE env var [HttpKernel] Improve PHPDoc on `#[AsController]` attribute
2 parents 11708b2 + 0470bb7 commit 634ca9c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.4
5+
---
6+
7+
* Allow setting the locale using `SYMFONY_PHPUNIT_LOCALE` env var
8+
49
6.3
510
---
611

Legacy/SymfonyTestsListenerTrait.php

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class SymfonyTestsListenerTrait
5050
*/
5151
public function __construct(array $mockedNamespaces = [])
5252
{
53+
setlocale(\LC_ALL, $_ENV['SYMFONY_PHPUNIT_LOCALE'] ?? 'C');
54+
5355
if (class_exists(ExcludeList::class)) {
5456
(new ExcludeList())->getExcludedDirectories();
5557
ExcludeList::addDirectory(\dirname((new \ReflectionClass(__CLASS__))->getFileName(), 2));

bootstrap.php

-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
unset($GLOBALS['__composer_autoload_files'][$fileIdentifier]);
3030
}
3131

32-
// Enforce a consistent locale
33-
setlocale(\LC_ALL, 'C');
34-
3532
if (class_exists(Deprecation::class)) {
3633
Deprecation::withoutDeduplication();
3734

0 commit comments

Comments
 (0)