From 65e1226fa462b445b911ce0da865cce942869379 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 17 May 2021 22:21:27 +0200 Subject: [PATCH] Fix merge --- .../DependencyInjection/Compiler/UnusedTagsPass.php | 3 +-- src/Symfony/Component/Validator/ValidatorBuilder.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php index ca43f2ec26..37f545468d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php @@ -72,9 +72,9 @@ class UnusedTagsPass implements CompilerPassInterface 'routing.expression_language_provider', 'routing.loader', 'routing.route_loader', - 'security.authenticator.login_linker', 'security.expression_language_provider', 'security.remember_me_aware', + 'security.authenticator.login_linker', 'security.voter', 'serializer.encoder', 'serializer.normalizer', @@ -88,7 +88,6 @@ class UnusedTagsPass implements CompilerPassInterface 'validator.auto_mapper', 'validator.constraint_validator', 'validator.initializer', - 'workflow.definition', ]; public function process(ContainerBuilder $container) diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php index eb9e536c8b..ce600242b5 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilder.php +++ b/src/Symfony/Component/Validator/ValidatorBuilder.php @@ -21,6 +21,7 @@ use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\ArrayAdapter; use Symfony\Component\Cache\DoctrineProvider as SymfonyDoctrineProvider; use Symfony\Component\Validator\Context\ExecutionContextFactory; +use Symfony\Component\Validator\Exception\LogicException; use Symfony\Component\Validator\Exception\ValidatorException; use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory; use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;