From 043b4259841933ec36891960534ecc11e904a64d Mon Sep 17 00:00:00 2001 From: javer Date: Wed, 15 May 2019 01:19:27 +0300 Subject: [PATCH] Fix BC break with DoctrineType::reset() Fixes BC break with mistakenly removed `kernel.reset` tag from `form.type.entity` service, because `DoctrineType` implements `ResetInterface`, but this service is not autoconfigured, so the `kernel.reset` tag won't be added automatically. This BC break was introduced in version 1.11.0 in commit 6b25ea4 --- DependencyInjection/DoctrineExtension.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php index 046c10763..daea1d7c7 100644 --- a/DependencyInjection/DoctrineExtension.php +++ b/DependencyInjection/DoctrineExtension.php @@ -23,6 +23,7 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\Form\AbstractType; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory; use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface; @@ -343,6 +344,10 @@ protected function ormLoad(array $config, ContainerBuilder $container) $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('orm.xml'); + if (class_exists(AbstractType::class)) { + $container->getDefinition('form.type.entity')->addTag('kernel.reset', ['method' => 'reset']); + } + $entityManagers = []; foreach (array_keys($config['entity_managers']) as $name) { $entityManagers[$name] = sprintf('doctrine.orm.%s_entity_manager', $name);