Merge branch '4.4' into 5.0

* 4.4: [Validator] fix low deps Don't patch BadFileName.php fixture file
symfony · Dec 10, 2019 · c6eae73 · c6eae73
2 parents 5f50769 + 4c50968
commit c6eae73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -16,6 +16,7 @@
         case false !== strpos(realpath($file), '/vendor/'):
         case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
         case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadFileName.php'):
         case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -35,7 +35,7 @@
         "symfony/proxy-manager-bridge": "^4.4|^5.0",
         "symfony/security-core": "^5.0",
         "symfony/expression-language": "^4.4|^5.0",
-        "symfony/validator": "^5.0.1",
+        "symfony/validator": "^5.0.2",
         "symfony/translation": "^4.4|^5.0",
         "symfony/var-dumper": "^4.4|^5.0",
         "doctrine/annotations": "~1.7",
@@ -55,7 +55,7 @@
         "symfony/property-info": "<5",
         "symfony/security-bundle": "<5",
         "symfony/security-core": "<5",
-        "symfony/validator": "<5.0.1"
+        "symfony/validator": "<5.0.2"
     },
     "suggest": {
         "symfony/form": "",

diff --git a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
@@ -12,13 +12,8 @@
 namespace Symfony\Component\Validator\Mapping;
 
 use Symfony\Component\Validator\Constraint;
-<<<<<<< HEAD
-=======
 use Symfony\Component\Validator\Constraints\DisableAutoMapping;
 use Symfony\Component\Validator\Constraints\EnableAutoMapping;
-use Symfony\Component\Validator\Constraints\Length;
-use Symfony\Component\Validator\Constraints\NotBlank;
->>>>>>> 4.4
 use Symfony\Component\Validator\Constraints\Traverse;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;