Skip to content

Commit e545b7c

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: always check for all fields to be mapped clarify exception when no args are configured [PropertyAccess] Handle interfaces in the invalid argument exception [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 432d337 + 0e2be95 commit e545b7c

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
@@ -79,10 +79,10 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
7979

8080
public function testSubmitFromSingleTextDateTime()
8181
{
82-
// we test against "de_AT", so we need the full implementation
82+
// we test against "de_DE", so we need the full implementation
8383
IntlTestHelper::requireFullIntl($this, false);
8484

85-
\Locale::setDefault('de_AT');
85+
\Locale::setDefault('de_DE');
8686

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

101101
public function testSubmitFromSingleTextString()
102102
{
103-
// we test against "de_AT", so we need the full implementation
103+
// we test against "de_DE", so we need the full implementation
104104
IntlTestHelper::requireFullIntl($this, false);
105105

106-
\Locale::setDefault('de_AT');
106+
\Locale::setDefault('de_DE');
107107

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

122122
public function testSubmitFromSingleTextTimestamp()
123123
{
124-
// we test against "de_AT", so we need the full implementation
124+
// we test against "de_DE", so we need the full implementation
125125
IntlTestHelper::requireFullIntl($this, false);
126126

127-
\Locale::setDefault('de_AT');
127+
\Locale::setDefault('de_DE');
128128

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

145145
public function testSubmitFromSingleTextRaw()
146146
{
147-
// we test against "de_AT", so we need the full implementation
147+
// we test against "de_DE", so we need the full implementation
148148
IntlTestHelper::requireFullIntl($this, false);
149149

150-
\Locale::setDefault('de_AT');
150+
\Locale::setDefault('de_DE');
151151

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

409409
public function testSetDataWithNegativeTimezoneOffsetStringInput()
410410
{
411-
// we test against "de_AT", so we need the full implementation
411+
// we test against "de_DE", so we need the full implementation
412412
IntlTestHelper::requireFullIntl($this, false);
413413

414-
\Locale::setDefault('de_AT');
414+
\Locale::setDefault('de_DE');
415415

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

431431
public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
432432
{
433-
// we test against "de_AT", so we need the full implementation
433+
// we test against "de_DE", so we need the full implementation
434434
IntlTestHelper::requireFullIntl($this, false);
435435

436-
\Locale::setDefault('de_AT');
436+
\Locale::setDefault('de_DE');
437437

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

0 commit comments

Comments
 (0)