diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 154ae76def0bc..4f3f65bfff8e3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -1005,12 +1005,6 @@ function ($a) { ->arrayNode('middlewares') ->addDefaultsIfNotSet() ->children() - ->arrayNode('doctrine_transaction') - ->canBeEnabled() - ->children() - ->scalarNode('entity_manager_name')->info('The name of the entity manager to use')->defaultNull()->end() - ->end() - ->end() ->arrayNode('validation') ->{!class_exists(FullStack::class) && class_exists(Validation::class) ? 'canBeDisabled' : 'canBeEnabled'}() ->end() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index b6b3a3dd9396c..520b2fb981429 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -13,7 +13,6 @@ use Doctrine\Common\Annotations\Reader; use Doctrine\Common\Annotations\AnnotationRegistry; -use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware; use Symfony\Bridge\Monolog\Processor\DebugProcessor; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\Controller; @@ -1454,15 +1453,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder $container->getDefinition('messenger.sender_locator')->replaceArgument(0, $senderLocatorMapping); $container->getDefinition('messenger.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping); - if ($config['middlewares']['doctrine_transaction']['enabled']) { - if (!class_exists(DoctrineTransactionMiddleware::class)) { - throw new LogicException('The Doctrine transaction middleware is only available when the doctrine bridge is installed. Try running "composer require symfony/doctrine-bridge".'); - } - $container->getDefinition('messenger.middleware.doctrine_transaction')->replaceArgument(1, $config['middlewares']['doctrine_transaction']['entity_manager_name']); - } else { - $container->removeDefinition('messenger.middleware.doctrine_transaction'); - } - if ($config['middlewares']['validation']['enabled']) { if (!$container->has('validator')) { throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index 580e2b8f4ae2b..240e2d2c488e7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -31,13 +31,6 @@ - - - - - - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd index fdf9ec5b0702c..00b61e30a0d07 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd @@ -370,16 +370,10 @@ - - - - - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index 97492186db81e..6216babe8151f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -254,10 +254,6 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor 'enabled' => !class_exists(FullStack::class) && class_exists(MessageBusInterface::class), 'routing' => array(), 'middlewares' => array( - 'doctrine_transaction' => array( - 'enabled' => false, - 'entity_manager_name' => null, - ), 'validation' => array( 'enabled' => !class_exists(FullStack::class), ), diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_doctrine.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_doctrine.php deleted file mode 100644 index 1295236717aef..0000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_doctrine.php +++ /dev/null @@ -1,11 +0,0 @@ -loadFromExtension('framework', array( - 'messenger' => array( - 'middlewares' => array( - 'doctrine_transaction' => array( - 'entity_manager_name' => 'foobar', - ), - ), - ), -)); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_doctrine.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_doctrine.xml deleted file mode 100644 index 8d9d8850f5c4c..0000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_doctrine.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_doctrine.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_doctrine.yml deleted file mode 100644 index 346fae558bd24..0000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_doctrine.yml +++ /dev/null @@ -1,5 +0,0 @@ -framework: - messenger: - middlewares: - doctrine_transaction: - entity_manager_name: 'foobar' diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 2ba8907135b0a..418c848bbdffd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -12,7 +12,6 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection; use Doctrine\Common\Annotations\Annotation; -use Symfony\Bridge\Doctrine\ContainerAwareEventManager; use Symfony\Bundle\FullStack; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass; @@ -521,18 +520,6 @@ public function testMessenger() $this->assertFalse($container->hasDefinition('messenger.middleware.doctrine_transaction')); } - public function testMessengerDoctrine() - { - if (!class_exists(ContainerAwareEventManager::class)) { - self::markTestSkipped('Skipping tests since Doctrine bridge is not installed'); - } - - $container = $this->createContainerFromFile('messenger_doctrine'); - $this->assertTrue($container->hasDefinition('messenger.middleware.doctrine_transaction')); - $def = $container->getDefinition('messenger.middleware.doctrine_transaction'); - $this->assertEquals('foobar', $def->getArgument(1)); - } - public function testMessengerValidationDisabled() { if (!class_exists(Validation::class)) {