From d4d81be289a81dd26646830133c44895b0adb250 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 27 Sep 2019 16:37:39 +0200 Subject: [PATCH 1/2] fix merge --- .../Component/Translation/Tests/DataCollectorTranslatorTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php b/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php index 06f4b20ba6..d3de1e259f 100644 --- a/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php +++ b/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php @@ -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], From fbfdebc4874607e79726ea7f817df0f50ed6657b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 27 Sep 2019 16:39:13 +0200 Subject: [PATCH 2/2] fix merge (bis) --- .../Component/Validator/Tests/Constraints/UrlValidatorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php index a073a390f2..b00746d7a1 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php @@ -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/'],