Skip to content

Commit 97601f6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.1
* 2.8: [ci] Testing with UTC hides bugs [DI] Fix error when trying to resolve a DefinitionDecorator [DoctrineBridge] Fix deprecation message/documentation of implementing UserProviderInterface using the entity provider [Validator] improve and added more Indonesian translation.
2 parents 3a0a15e + 1512502 commit 97601f6

12 files changed

+41
-41
lines changed

‎Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testTransformWithRounding($input, $output, $roundingMode)
8787
public function testReverseTransform()
8888
{
8989
// Since we test against "de_AT", we need the full implementation
90-
IntlTestHelper::requireFullIntl($this);
90+
IntlTestHelper::requireFullIntl($this, false);
9191

9292
\Locale::setDefault('de_AT');
9393

@@ -109,7 +109,7 @@ public function testReverseTransformEmpty()
109109
public function testReverseTransformWithGrouping()
110110
{
111111
// Since we test against "de_DE", we need the full implementation
112-
IntlTestHelper::requireFullIntl($this);
112+
IntlTestHelper::requireFullIntl($this, false);
113113

114114
\Locale::setDefault('de_DE');
115115

‎Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MoneyToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
1919
public function testTransform()
2020
{
2121
// Since we test against "de_AT", we need the full implementation
22-
IntlTestHelper::requireFullIntl($this);
22+
IntlTestHelper::requireFullIntl($this, false);
2323

2424
\Locale::setDefault('de_AT');
2525

@@ -47,7 +47,7 @@ public function testTransformEmpty()
4747
public function testReverseTransform()
4848
{
4949
// Since we test against "de_AT", we need the full implementation
50-
IntlTestHelper::requireFullIntl($this);
50+
IntlTestHelper::requireFullIntl($this, false);
5151

5252
\Locale::setDefault('de_AT');
5353

‎Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function provideTransformations()
4242
public function testTransform($from, $to, $locale)
4343
{
4444
// Since we test against other locales, we need the full implementation
45-
IntlTestHelper::requireFullIntl($this);
45+
IntlTestHelper::requireFullIntl($this, false);
4646

4747
\Locale::setDefault($locale);
4848

@@ -68,7 +68,7 @@ public function provideTransformationsWithGrouping()
6868
public function testTransformWithGrouping($from, $to, $locale)
6969
{
7070
// Since we test against other locales, we need the full implementation
71-
IntlTestHelper::requireFullIntl($this);
71+
IntlTestHelper::requireFullIntl($this, false);
7272

7373
\Locale::setDefault($locale);
7474

@@ -80,7 +80,7 @@ public function testTransformWithGrouping($from, $to, $locale)
8080
public function testTransformWithScale()
8181
{
8282
// Since we test against "de_AT", we need the full implementation
83-
IntlTestHelper::requireFullIntl($this);
83+
IntlTestHelper::requireFullIntl($this, false);
8484

8585
\Locale::setDefault('de_AT');
8686

@@ -185,7 +185,7 @@ public function transformWithRoundingProvider()
185185
public function testTransformWithRounding($scale, $input, $output, $roundingMode)
186186
{
187187
// Since we test against "de_AT", we need the full implementation
188-
IntlTestHelper::requireFullIntl($this);
188+
IntlTestHelper::requireFullIntl($this, false);
189189

190190
\Locale::setDefault('de_AT');
191191

@@ -197,7 +197,7 @@ public function testTransformWithRounding($scale, $input, $output, $roundingMode
197197
public function testTransformDoesNotRoundIfNoScale()
198198
{
199199
// Since we test against "de_AT", we need the full implementation
200-
IntlTestHelper::requireFullIntl($this);
200+
IntlTestHelper::requireFullIntl($this, false);
201201

202202
\Locale::setDefault('de_AT');
203203

@@ -212,7 +212,7 @@ public function testTransformDoesNotRoundIfNoScale()
212212
public function testReverseTransform($to, $from, $locale)
213213
{
214214
// Since we test against other locales, we need the full implementation
215-
IntlTestHelper::requireFullIntl($this);
215+
IntlTestHelper::requireFullIntl($this, false);
216216

217217
\Locale::setDefault($locale);
218218

@@ -227,7 +227,7 @@ public function testReverseTransform($to, $from, $locale)
227227
public function testReverseTransformWithGrouping($to, $from, $locale)
228228
{
229229
// Since we test against other locales, we need the full implementation
230-
IntlTestHelper::requireFullIntl($this);
230+
IntlTestHelper::requireFullIntl($this, false);
231231

232232
\Locale::setDefault($locale);
233233

@@ -242,7 +242,7 @@ public function testReverseTransformWithGrouping($to, $from, $locale)
242242
public function testReverseTransformWithGroupingAndFixedSpaces()
243243
{
244244
// Since we test against other locales, we need the full implementation
245-
IntlTestHelper::requireFullIntl($this);
245+
IntlTestHelper::requireFullIntl($this, false);
246246

247247
\Locale::setDefault('ru');
248248

@@ -254,7 +254,7 @@ public function testReverseTransformWithGroupingAndFixedSpaces()
254254
public function testReverseTransformWithGroupingButWithoutGroupSeparator()
255255
{
256256
// Since we test against "de_AT", we need the full implementation
257-
IntlTestHelper::requireFullIntl($this);
257+
IntlTestHelper::requireFullIntl($this, false);
258258

259259
\Locale::setDefault('de_AT');
260260

@@ -374,7 +374,7 @@ public function testReverseTransformDoesNotRoundIfNoScale()
374374
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
375375
{
376376
// Since we test against other locales, we need the full implementation
377-
IntlTestHelper::requireFullIntl($this);
377+
IntlTestHelper::requireFullIntl($this, false);
378378

379379
\Locale::setDefault('fr');
380380
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -394,7 +394,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
394394
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
395395
{
396396
// Since we test against "de_DE", we need the full implementation
397-
IntlTestHelper::requireFullIntl($this);
397+
IntlTestHelper::requireFullIntl($this, false);
398398

399399
\Locale::setDefault('de_DE');
400400

@@ -409,7 +409,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
409409
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
410410
{
411411
// Since we test against "de_DE", we need the full implementation
412-
IntlTestHelper::requireFullIntl($this);
412+
IntlTestHelper::requireFullIntl($this, false);
413413

414414
\Locale::setDefault('de_DE');
415415

@@ -421,7 +421,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGro
421421
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupingUsed()
422422
{
423423
// Since we test against other locales, we need the full implementation
424-
IntlTestHelper::requireFullIntl($this);
424+
IntlTestHelper::requireFullIntl($this, false);
425425

426426
\Locale::setDefault('fr');
427427
$transformer = new NumberToLocalizedStringTransformer();
@@ -433,7 +433,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupin
433433
public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
434434
{
435435
// Since we test against other locales, we need the full implementation
436-
IntlTestHelper::requireFullIntl($this);
436+
IntlTestHelper::requireFullIntl($this, false);
437437

438438
\Locale::setDefault('bg');
439439
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -585,7 +585,7 @@ public function testReverseTransformDisallowsCenteredExtraCharacters()
585585
public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
586586
{
587587
// Since we test against other locales, we need the full implementation
588-
IntlTestHelper::requireFullIntl($this);
588+
IntlTestHelper::requireFullIntl($this, false);
589589

590590
\Locale::setDefault('ru');
591591

@@ -601,7 +601,7 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
601601
public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
602602
{
603603
// Since we test against other locales, we need the full implementation
604-
IntlTestHelper::requireFullIntl($this);
604+
IntlTestHelper::requireFullIntl($this, false);
605605

606606
\Locale::setDefault('ru');
607607

@@ -628,7 +628,7 @@ public function testReverseTransformDisallowsTrailingExtraCharacters()
628628
public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
629629
{
630630
// Since we test against other locales, we need the full implementation
631-
IntlTestHelper::requireFullIntl($this);
631+
IntlTestHelper::requireFullIntl($this, false);
632632

633633
\Locale::setDefault('ru');
634634

‎Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testTransformWithInteger()
5353
public function testTransformWithScale()
5454
{
5555
// Since we test against "de_AT", we need the full implementation
56-
IntlTestHelper::requireFullIntl($this);
56+
IntlTestHelper::requireFullIntl($this, false);
5757

5858
\Locale::setDefault('de_AT');
5959

@@ -92,7 +92,7 @@ public function testReverseTransformWithInteger()
9292
public function testReverseTransformWithScale()
9393
{
9494
// Since we test against "de_AT", we need the full implementation
95-
IntlTestHelper::requireFullIntl($this);
95+
IntlTestHelper::requireFullIntl($this, false);
9696

9797
\Locale::setDefault('de_AT');
9898

‎Tests/Extension/Core/Type/CountryTypeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CountryTypeTest extends TestCase
1919
{
2020
protected function setUp()
2121
{
22-
IntlTestHelper::requireIntl($this);
22+
IntlTestHelper::requireIntl($this, false);
2323

2424
parent::setUp();
2525
}

‎Tests/Extension/Core/Type/CurrencyTypeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CurrencyTypeTest extends TestCase
1919
{
2020
protected function setUp()
2121
{
22-
IntlTestHelper::requireIntl($this);
22+
IntlTestHelper::requireIntl($this, false);
2323

2424
parent::setUp();
2525
}

‎Tests/Extension/Core/Type/DateTypeTest.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
7070
public function testSubmitFromSingleTextDateTime()
7171
{
7272
// we test against "de_AT", so we need the full implementation
73-
IntlTestHelper::requireFullIntl($this);
73+
IntlTestHelper::requireFullIntl($this, false);
7474

7575
\Locale::setDefault('de_AT');
7676

@@ -91,7 +91,7 @@ public function testSubmitFromSingleTextDateTime()
9191
public function testSubmitFromSingleTextString()
9292
{
9393
// we test against "de_AT", so we need the full implementation
94-
IntlTestHelper::requireFullIntl($this);
94+
IntlTestHelper::requireFullIntl($this, false);
9595

9696
\Locale::setDefault('de_AT');
9797

@@ -112,7 +112,7 @@ public function testSubmitFromSingleTextString()
112112
public function testSubmitFromSingleTextTimestamp()
113113
{
114114
// we test against "de_AT", so we need the full implementation
115-
IntlTestHelper::requireFullIntl($this);
115+
IntlTestHelper::requireFullIntl($this, false);
116116

117117
\Locale::setDefault('de_AT');
118118

@@ -135,7 +135,7 @@ public function testSubmitFromSingleTextTimestamp()
135135
public function testSubmitFromSingleTextRaw()
136136
{
137137
// we test against "de_AT", so we need the full implementation
138-
IntlTestHelper::requireFullIntl($this);
138+
IntlTestHelper::requireFullIntl($this, false);
139139

140140
\Locale::setDefault('de_AT');
141141

@@ -399,7 +399,7 @@ public function testThrowExceptionIfDaysIsInvalid()
399399
public function testSetDataWithNegativeTimezoneOffsetStringInput()
400400
{
401401
// we test against "de_AT", so we need the full implementation
402-
IntlTestHelper::requireFullIntl($this);
402+
IntlTestHelper::requireFullIntl($this, false);
403403

404404
\Locale::setDefault('de_AT');
405405

@@ -421,7 +421,7 @@ public function testSetDataWithNegativeTimezoneOffsetStringInput()
421421
public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
422422
{
423423
// we test against "de_AT", so we need the full implementation
424-
IntlTestHelper::requireFullIntl($this);
424+
IntlTestHelper::requireFullIntl($this, false);
425425

426426
\Locale::setDefault('de_AT');
427427

@@ -495,7 +495,7 @@ public function testMonthsOptionShortFormat()
495495
public function testMonthsOptionLongFormat()
496496
{
497497
// we test against "de_AT", so we need the full implementation
498-
IntlTestHelper::requireFullIntl($this);
498+
IntlTestHelper::requireFullIntl($this, false);
499499

500500
\Locale::setDefault('de_AT');
501501

@@ -515,7 +515,7 @@ public function testMonthsOptionLongFormat()
515515
public function testMonthsOptionLongFormatWithDifferentTimezone()
516516
{
517517
// we test against "de_AT", so we need the full implementation
518-
IntlTestHelper::requireFullIntl($this);
518+
IntlTestHelper::requireFullIntl($this, false);
519519

520520
\Locale::setDefault('de_AT');
521521

@@ -621,7 +621,7 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndDayEmpty()
621621
public function testPassDatePatternToView()
622622
{
623623
// we test against "de_AT", so we need the full implementation
624-
IntlTestHelper::requireFullIntl($this);
624+
IntlTestHelper::requireFullIntl($this, false);
625625

626626
\Locale::setDefault('de_AT');
627627

@@ -634,7 +634,7 @@ public function testPassDatePatternToView()
634634
public function testPassDatePatternToViewDifferentFormat()
635635
{
636636
// we test against "de_AT", so we need the full implementation
637-
IntlTestHelper::requireFullIntl($this);
637+
IntlTestHelper::requireFullIntl($this, false);
638638

639639
\Locale::setDefault('de_AT');
640640

@@ -682,7 +682,7 @@ public function testDontPassDatePatternIfText()
682682
public function testDatePatternFormatWithQuotedStrings()
683683
{
684684
// we test against "es_ES", so we need the full implementation
685-
IntlTestHelper::requireFullIntl($this);
685+
IntlTestHelper::requireFullIntl($this, false);
686686

687687
\Locale::setDefault('es_ES');
688688

‎Tests/Extension/Core/Type/IntegerTypeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class IntegerTypeTest extends TestCase
1818
{
1919
protected function setUp()
2020
{
21-
IntlTestHelper::requireIntl($this);
21+
IntlTestHelper::requireIntl($this, false);
2222

2323
parent::setUp();
2424
}

‎Tests/Extension/Core/Type/LanguageTypeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LanguageTypeTest extends TestCase
1919
{
2020
protected function setUp()
2121
{
22-
IntlTestHelper::requireIntl($this);
22+
IntlTestHelper::requireIntl($this, false);
2323

2424
parent::setUp();
2525
}

‎Tests/Extension/Core/Type/LocaleTypeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LocaleTypeTest extends TestCase
1919
{
2020
protected function setUp()
2121
{
22-
IntlTestHelper::requireIntl($this);
22+
IntlTestHelper::requireIntl($this, false);
2323

2424
parent::setUp();
2525
}

0 commit comments

Comments
 (0)