Merge branch '4.3' into 4.4
* 4.3: fix merge (bis) fix merge
This commit is contained in:
commit
50da16bb6e
@ -99,6 +99,7 @@ class DataCollectorTranslatorTest extends TestCase
|
||||
'id' => 'choice',
|
||||
'translation' => 'choice',
|
||||
'locale' => 'en',
|
||||
'fallbackLocale' => null,
|
||||
'domain' => 'messages',
|
||||
'state' => DataCollectorTranslator::MESSAGE_MISSING,
|
||||
'parameters' => ['%count%' => 0],
|
||||
|
@ -92,6 +92,7 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
|
||||
{
|
||||
return [
|
||||
['//example.com'],
|
||||
['//examp_le.com'],
|
||||
['//symfony.fake/blog/'],
|
||||
['//symfony.com/search?type=&q=url+validator'],
|
||||
];
|
||||
@ -217,7 +218,6 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
|
||||
{
|
||||
return [
|
||||
['/example.com'],
|
||||
['//examp_le.com'],
|
||||
['//example.com::aa'],
|
||||
['//example.com:aa'],
|
||||
['//127.0.0.1:aa/'],
|
||||
|
Reference in New Issue
Block a user