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:
commit
c6eae73d15
1
.github/patch-types.php
vendored
1
.github/patch-types.php
vendored
@ -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'):
|
||||||
|
@ -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": "",
|
||||||
|
@ -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;
|
||||||
|
Reference in New Issue
Block a user