diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.0 

* 4.4:
  [Validator] fix low deps
  Don't patch BadFileName.php fixture file
This commit is contained in:
Nicolas Grekas 2019-12-10 14:44:54 +01:00
parent 5f50769825 4c50968dd8
commit c6eae73d15
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/patch-types.php vendored
View File

@ -16,6 +16,7 @@ foreach ($loader->getClassMap() as $class => $file) {
case false !== strpos(realpath($file), '/vendor/'): case false !== strpos(realpath($file), '/vendor/'):
case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'): 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/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/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/Compiler/OptionalServiceClass.php'):
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'): case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):

4
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -35,7 +35,7 @@
"symfony/proxy-manager-bridge": "^4.4|^5.0", "symfony/proxy-manager-bridge": "^4.4|^5.0",
"symfony/security-core": "^5.0", "symfony/security-core": "^5.0",
"symfony/expression-language": "^4.4|^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/translation": "^4.4|^5.0",
"symfony/var-dumper": "^4.4|^5.0", "symfony/var-dumper": "^4.4|^5.0",
"doctrine/annotations": "~1.7", "doctrine/annotations": "~1.7",
@ -55,7 +55,7 @@
"symfony/property-info": "<5", "symfony/property-info": "<5",
"symfony/security-bundle": "<5", "symfony/security-bundle": "<5",
"symfony/security-core": "<5", "symfony/security-core": "<5",
"symfony/validator": "<5.0.1" "symfony/validator": "<5.0.2"
}, },
"suggest": { "suggest": {
"symfony/form": "", "symfony/form": "",

5
src/Symfony/Component/Validator/Mapping/GenericMetadata.php
View File

@ -12,13 +12,8 @@
namespace Symfony\Component\Validator\Mapping; namespace Symfony\Component\Validator\Mapping;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
<<<<<<< HEAD
=======
use Symfony\Component\Validator\Constraints\DisableAutoMapping; use Symfony\Component\Validator\Constraints\DisableAutoMapping;
use Symfony\Component\Validator\Constraints\EnableAutoMapping; 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\Traverse;
use Symfony\Component\Validator\Constraints\Valid; use Symfony\Component\Validator\Constraints\Valid;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException; use Symfony\Component\Validator\Exception\ConstraintDefinitionException;