cs and minors

Nyholm · Nyholm · commit 09e5daf988de · 2018-03-27T09:47:26.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1449,7 +1449,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
         if ($config['doctrine_transaction']['enabled']) {
             if (!class_exists(DoctrineTransactionMiddleware::class)) {
-                throw new LogicException('You must install symfony/doctrine-bridge to use the "DoctrineTransactionMiddleware"');
+                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['doctrine_transaction']['entity_manager_name']);
         } else {
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
@@ -363,9 +363,7 @@
     </xsd:complexType>
 
     <xsd:complexType name="messenger_doctrine_transaction">
-        <xsd:sequence>
-            <xsd:element name="entity-manager-name" type="xsd:string" />
-        </xsd:sequence>
+        <xsd:attribute name="entity-manager-name" type="xsd:string" />
         <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 </xsd:schema>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
@@ -8,11 +8,11 @@
     <framework:config>
         <framework:messenger>
             <framework:routing message-class="App\Bar">
-                <framework:sender service="sender.bar"></framework:sender>
-                <framework:sender service="sender.biz"></framework:sender>
+                <framework:sender service="sender.bar" />
+                <framework:sender service="sender.biz" />
             </framework:routing>
             <framework:routing message-class="App\Foo">
-                <framework:sender service="sender.foo"></framework:sender>
+                <framework:sender service="sender.foo" />
             </framework:routing>
         </framework:messenger>
     </framework:config>
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
@@ -7,9 +7,7 @@
 
     <framework:config>
         <framework:messenger>
-            <framework:doctrine-transaction>
-                <framework:entity-manager-name>foobar</framework:entity-manager-name>
-            </framework:doctrine-transaction>
+            <framework:doctrine-transaction entity-manager-name="foobar" />
         </framework:messenger>
     </framework:config>
 </container>

Original file line number	Diff line number	Diff line change
`@@ -1449,7 +1449,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder`
`1449`	`1449`
`1450`	`1450`	`if ($config['doctrine_transaction']['enabled']) {`
`1451`	`1451`	`if (!class_exists(DoctrineTransactionMiddleware::class)) {`
`1452`		`- throw new LogicException('You must install symfony/doctrine-bridge to use the "DoctrineTransactionMiddleware"');`
	`1452`	`+ throw new LogicException('The Doctrine transaction middleware is only available when the doctrine bridge is installed. Try running "composer require symfony/doctrine-bridge".');`
`1453`	`1453`	`}`
`1454`	`1454`	`$container->getDefinition('messenger.middleware.doctrine_transaction')->replaceArgument(1, $config['doctrine_transaction']['entity_manager_name']);`
`1455`	`1455`	`} else {`