From a5afe47ccfcc4990507adc5bd64d43a63b45ee09 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Fri, 23 Apr 2021 19:04:56 +0200 Subject: [PATCH] [CI] Make sure to restore default locale --- .../Component/Form/Tests/AbstractLayoutTest.php | 3 +++ .../DateTimeToLocalizedStringTransformerTest.php | 3 +++ .../MoneyToLocalizedStringTransformerTest.php | 3 +++ .../Tests/Extension/Core/Type/DateTimeTypeTest.php | 9 ++++++++- .../Tests/Data/Provider/AbstractDataProviderTest.php | 8 ++++++++ .../Component/Intl/Tests/ResourceBundleTestCase.php | 7 +++++++ .../Contracts/Translation/Test/TranslatorTest.php | 12 ++++++++++++ 7 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index 52ef5360bc677..97ff43fc8f96b 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -26,6 +26,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase protected $csrfTokenManager; protected $testableFeatures = []; + private $defaultLocale; protected function setUp(): void { @@ -33,6 +34,7 @@ protected function setUp(): void $this->markTestSkipped('Extension intl is required.'); } + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); $this->csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class); @@ -50,6 +52,7 @@ protected function getExtensions() protected function tearDown(): void { $this->csrfTokenManager = null; + \Locale::setDefault($this->defaultLocale); parent::tearDown(); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php index e2aa4748d8cfc..cde7cd531a892 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -23,6 +23,7 @@ class DateTimeToLocalizedStringTransformerTest extends TestCase protected $dateTime; protected $dateTimeWithoutSeconds; + private $defaultLocale; protected function setUp(): void { @@ -37,6 +38,7 @@ protected function setUp(): void // Since we test against "de_AT", we need the full implementation IntlTestHelper::requireFullIntl($this, '57.1'); + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('de_AT'); $this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC'); @@ -47,6 +49,7 @@ protected function tearDown(): void { $this->dateTime = null; $this->dateTimeWithoutSeconds = null; + \Locale::setDefault($this->defaultLocale); } public function dataProvider() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php index 4bc43fc8dfcef..d6459acc5ed33 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php @@ -19,15 +19,18 @@ class MoneyToLocalizedStringTransformerTest extends TestCase { private $previousLocale; + private $defaultLocale; protected function setUp(): void { $this->previousLocale = setlocale(\LC_ALL, '0'); + $this->defaultLocale = \Locale::getDefault(); } protected function tearDown(): void { setlocale(\LC_ALL, $this->previousLocale); + \Locale::setDefault($this->defaultLocale); } public function testTransform() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index 506ec11f78094..db2623aac9412 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -18,13 +18,20 @@ class DateTimeTypeTest extends BaseTypeTest { public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType'; + private $defaultLocale; + protected function setUp(): void { + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); - parent::setUp(); } + protected function tearDown(): void + { + \Locale::setDefault($this->defaultLocale); + } + public function testSubmitDateTime() { $form = $this->factory->create(static::TESTED_TYPE, null, [ diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php index 0086fbdffab3a..84f5eac30422d 100644 --- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php +++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php @@ -733,12 +733,20 @@ abstract class AbstractDataProviderTest extends TestCase private static $rootLocales; + private $defaultLocale; + protected function setUp(): void { + $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); Locale::setDefaultFallback('en'); } + protected function tearDown(): void + { + \Locale::setDefault($this->defaultLocale); + } + public function provideLocales() { return array_map( diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php index 5b0096aab6423..2f13602f7e5c4 100644 --- a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php +++ b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php @@ -725,13 +725,20 @@ abstract class ResourceBundleTestCase extends TestCase ]; private static $rootLocales; + private $defaultLocale; protected function setUp(): void { + $this->defaultLocale = \Locale::getDefault(); Locale::setDefault('en'); Locale::setDefaultFallback('en'); } + protected function tearDown(): void + { + \Locale::setDefault($this->defaultLocale); + } + public function provideLocales() { return array_map( diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php index f1261e80d3e5f..89d9fc06d159b 100644 --- a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php +++ b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php @@ -30,6 +30,18 @@ */ class TranslatorTest extends TestCase { + private $defaultLocale; + + protected function setUp(): void + { + $this->defaultLocale = \Locale::getDefault(); + } + + protected function tearDown(): void + { + \Locale::setDefault($this->defaultLocale); + } + public function getTranslator() { return new class() implements TranslatorInterface { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy