Skip to content

Commit 9884431

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: always check for all fields to be mapped clarify exception when no args are configured [PropertyAccess] Handle interfaces in the invalid argument exception [DI] Fix defaults overriding empty strings in AutowirePass [Debug] Workaround "null" $context [Debug] Remove $context arg from handleError(), preparing for PHP 7.2 [Routing] Fix BC break in AnnotationClassLoader defaults attributes handling Fix tests with ICU 57.1 Fix the condition checking the minimum ICU version
2 parents 4afc2d6 + e545b7c commit 9884431

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
6969

7070
public function testSubmitFromSingleTextDateTime()
7171
{
72-
// we test against "de_AT", so we need the full implementation
72+
// we test against "de_DE", so we need the full implementation
7373
IntlTestHelper::requireFullIntl($this, false);
7474

75-
\Locale::setDefault('de_AT');
75+
\Locale::setDefault('de_DE');
7676

7777
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
7878
'format' => \IntlDateFormatter::MEDIUM,
@@ -90,10 +90,10 @@ public function testSubmitFromSingleTextDateTime()
9090

9191
public function testSubmitFromSingleTextString()
9292
{
93-
// we test against "de_AT", so we need the full implementation
93+
// we test against "de_DE", so we need the full implementation
9494
IntlTestHelper::requireFullIntl($this, false);
9595

96-
\Locale::setDefault('de_AT');
96+
\Locale::setDefault('de_DE');
9797

9898
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
9999
'format' => \IntlDateFormatter::MEDIUM,
@@ -111,10 +111,10 @@ public function testSubmitFromSingleTextString()
111111

112112
public function testSubmitFromSingleTextTimestamp()
113113
{
114-
// we test against "de_AT", so we need the full implementation
114+
// we test against "de_DE", so we need the full implementation
115115
IntlTestHelper::requireFullIntl($this, false);
116116

117-
\Locale::setDefault('de_AT');
117+
\Locale::setDefault('de_DE');
118118

119119
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
120120
'format' => \IntlDateFormatter::MEDIUM,
@@ -134,10 +134,10 @@ public function testSubmitFromSingleTextTimestamp()
134134

135135
public function testSubmitFromSingleTextRaw()
136136
{
137-
// we test against "de_AT", so we need the full implementation
137+
// we test against "de_DE", so we need the full implementation
138138
IntlTestHelper::requireFullIntl($this, false);
139139

140-
\Locale::setDefault('de_AT');
140+
\Locale::setDefault('de_DE');
141141

142142
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
143143
'format' => \IntlDateFormatter::MEDIUM,
@@ -398,10 +398,10 @@ public function testThrowExceptionIfDaysIsInvalid()
398398

399399
public function testSetDataWithNegativeTimezoneOffsetStringInput()
400400
{
401-
// we test against "de_AT", so we need the full implementation
401+
// we test against "de_DE", so we need the full implementation
402402
IntlTestHelper::requireFullIntl($this, false);
403403

404-
\Locale::setDefault('de_AT');
404+
\Locale::setDefault('de_DE');
405405

406406
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
407407
'format' => \IntlDateFormatter::MEDIUM,
@@ -420,10 +420,10 @@ public function testSetDataWithNegativeTimezoneOffsetStringInput()
420420

421421
public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
422422
{
423-
// we test against "de_AT", so we need the full implementation
423+
// we test against "de_DE", so we need the full implementation
424424
IntlTestHelper::requireFullIntl($this, false);
425425

426-
\Locale::setDefault('de_AT');
426+
\Locale::setDefault('de_DE');
427427

428428
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
429429
'format' => \IntlDateFormatter::MEDIUM,

0 commit comments

Comments
 (0)