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

Merge branch '5.2' into 5.x

Browse Source 
* 5.2:
  Fix merge
This commit is contained in:
Alexander M. Turek 2021-05-17 22:32:20 +02:00
commit 58ca36fb4b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
View File

@ -74,10 +74,9 @@ class UnusedTagsPass implements CompilerPassInterface
'routing.expression_language_provider', 'routing.expression_language_provider',
'routing.loader', 'routing.loader',
'routing.route_loader', 'routing.route_loader',
'security.authenticator.login_linker',
'security.expression_language_provider', 'security.expression_language_provider',
'security.remember_me_aware', 'security.remember_me_aware',
'security.remember_me_handler', 'security.authenticator.login_linker',
'security.voter', 'security.voter',
'serializer.encoder', 'serializer.encoder',
'serializer.normalizer', 'serializer.normalizer',
@ -92,7 +91,6 @@ class UnusedTagsPass implements CompilerPassInterface
'validator.auto_mapper', 'validator.auto_mapper',
'validator.constraint_validator', 'validator.constraint_validator',
'validator.initializer', 'validator.initializer',
'workflow.definition',
]; ];
public function process(ContainerBuilder $container) public function process(ContainerBuilder $container)

1
src/Symfony/Component/Validator/ValidatorBuilder.php
View File

@ -21,6 +21,7 @@ use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\Adapter\ArrayAdapter; use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Cache\DoctrineProvider as SymfonyDoctrineProvider; use Symfony\Component\Cache\DoctrineProvider as SymfonyDoctrineProvider;
use Symfony\Component\Validator\Context\ExecutionContextFactory; use Symfony\Component\Validator\Context\ExecutionContextFactory;
use Symfony\Component\Validator\Exception\LogicException;
use Symfony\Component\Validator\Exception\ValidatorException; use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory; use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface; use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;