Skip to content

Commit e597a3a

Browse files
Merge branch '7.4' into 8.0
* 7.4: [ObjectMapper] do not require mapping a target's required promoted property when not on source (#2) run tests with PHPUnit 12.3 [GitHub] Update .github/PULL_REQUEST_TEMPLATE.md to remove SF 7.2 as it's not supported anymore [CI] fixed the Intl data tests actions Tests fails due to unknown option -v which is shorthand of the --verbose as per the phpunit its removed without any replacement sebastianbergmann/phpunit#5647 (comment) [Mailer] Fix expected exception message to include quotes around "http(s)://" [WebProfilerBundle] Fix toolbar not rendering after replacing it [Validator] (60455) Validate translations for Arabic (ar) (60474) Remove translation state attribute for Twig template validator in Ukrainian translation [VarDumper] Fix dumping objects from the DOM extension [Mailer] Add MicrosoftGraph API Transport [Yaml] Fix code style [Tests] Adapt testAddHtmlContentWithErrors to be HTML5 compliant Add friendly name in the `to` field [ObjectMapper] read source metadata before transform [HtmlSanitizer] Fix force_attributes not replacing existing attribute in initial data
2 parents da786d8 + 3c5c0dc commit e597a3a

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ protected function setUp(): void
5252

5353
protected function tearDown(): void
5454
{
55-
\Locale::setDefault($this->defaultLocale);
55+
if (isset($this->defaultLocale)) {
56+
\Locale::setDefault($this->defaultLocale);
57+
}
5658

5759
if (\extension_loaded('intl')) {
5860
ini_set('intl.use_exceptions', $this->initialTestCaseUseException);

Tests/Extension/Core/Type/IntegerTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ protected function setUp(): void
3030

3131
protected function tearDown(): void
3232
{
33-
\Locale::setDefault($this->previousLocale);
33+
if (isset($this->defaultLocale)) {
34+
\Locale::setDefault($this->defaultLocale);
35+
}
3436
}
3537

3638
#[RequiresPhpExtension('intl')]

Tests/Extension/Core/Type/MoneyTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ protected function setUp(): void
3434

3535
protected function tearDown(): void
3636
{
37-
\Locale::setDefault($this->defaultLocale);
37+
if (isset($this->defaultLocale)) {
38+
\Locale::setDefault($this->defaultLocale);
39+
}
3840
}
3941

4042
public function testPassMoneyPatternToView()

Tests/Extension/Core/Type/NumberTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ protected function setUp(): void
3535

3636
protected function tearDown(): void
3737
{
38-
\Locale::setDefault($this->defaultLocale);
38+
if (isset($this->defaultLocale)) {
39+
\Locale::setDefault($this->defaultLocale);
40+
}
3941
}
4042

4143
public function testDefaultFormatting()

Tests/Extension/Core/Type/PercentTypeTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ protected function setUp(): void
3434

3535
protected function tearDown(): void
3636
{
37-
\Locale::setDefault($this->defaultLocale);
37+
if (isset($this->defaultLocale)) {
38+
\Locale::setDefault($this->defaultLocale);
39+
}
3840
}
3941

4042
public function testSubmitWithRoundingMode()

0 commit comments

Comments
 (0)