Merge branch '4.4'
* 4.4: fix merge (bis) fix merge
This commit is contained in:
commit
7daf7df2ff
@ -88,6 +88,7 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['//example.com'],
|
['//example.com'],
|
||||||
|
['//examp_le.com'],
|
||||||
['//symfony.fake/blog/'],
|
['//symfony.fake/blog/'],
|
||||||
['//symfony.com/search?type=&q=url+validator'],
|
['//symfony.com/search?type=&q=url+validator'],
|
||||||
];
|
];
|
||||||
@ -213,7 +214,6 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['/example.com'],
|
['/example.com'],
|
||||||
['//examp_le.com'],
|
|
||||||
['//example.com::aa'],
|
['//example.com::aa'],
|
||||||
['//example.com:aa'],
|
['//example.com:aa'],
|
||||||
['//127.0.0.1:aa/'],
|
['//127.0.0.1:aa/'],
|
||||||
|
Reference in New Issue
Block a user