8000 [Messenger] Add a middleware that wraps all handlers in one Doctrine transaction. by Nyholm · Pull Request #26647 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Messenger] Add a middleware that wraps all handlers in one Doctrine transaction. #26647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed

[Messenger] Add a middleware that wraps all handlers in one Doctrine transaction. #26647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e62a0c9
Add a middleware that wraps all handlers in one Doctrine transaction.
Nyholm Mar 23, 2018
78f021d
Updated extension
Nyholm Mar 23, 2018
50f2cb8
cs
Nyholm Mar 23, 2018
11a3aab
Fixed tests
Nyholm Mar 23, 2018
373a2d4
Handle a return value
Nyholm Mar 23, 2018
4f54988
minor
Nyholm Mar 23, 2018
1eb6f4d
Updates according to feedback
Nyholm Mar 23, 2018
8b87f2b
Do not use an anonymous function
Nyholm Mar 23, 2018
a32e6b8
Added tests
Nyholm Mar 23, 2018
0261a51
Adding configuration definition
Nyholm Mar 23, 2018
f362f50
cs
Nyholm Mar 23, 2018
a629620
cs
Nyholm Mar 23, 2018
05ac7cf
Allow null
Nyholm 8000 Mar 26, 2018
0e0ab07
Moved to DoctrineBridge
Nyholm Mar 26, 2018
af65748
Added extra check
Nyholm Mar 26, 2018
701c665
Updating configuration
Nyholm Mar 26, 2018
b336d04
Fixed tests
Nyholm Mar 26, 2018
7d84394
cs
Nyholm Mar 26, 2018
09e5daf
cs and minors
Nyholm Mar 27, 2018
dcb07ca
Fixed tests
Nyholm Mar 27, 2018
1603708
Fixed EOL
Nyholm Mar 27, 2018
399f7c5
Added config key "middlewares"
Nyholm Mar 27, 2018
5a6b8de
cs
Nyholm Mar 27, 2018
68131f4
Use `addDefaultsIfNotSet()`
Nyholm Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding configuration definition
  • Loading branch information
@Nyholm
Nyholm committed Mar 27, 2018
commit 0261a51f9cc17c71e0820f8807b43f5e047a828f
29 changes: 29 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<xsd:element name="cache" type="cache" minOccurs="0" maxOccurs="1" />
<xsd:element name="workflow" type="workflow" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="lock" type="lock" minOccurs="0" maxOccurs="1" />
<xsd:element name="messenger" type="messenger" minOccurs="0" maxOccurs="1" />
</xsd:choice>

<xsd:attribute name="http-method-override" type="xsd:boolean" />
Expand Down Expand Up @@ -342,4 +343,32 @@
</xsd:extension>
</xsd:simpleContent 8000 >
</xsd:complexType>

<xsd:complexType name="messenger">
<xsd:all>
<xsd:element name="routing" type="messenger_routing" minOccurs="0" maxOccurs="1" />
<xsd:element name="doctrine-transaction" type="messenger_doctrine_transaction" minOccurs="0" maxOccurs="1" />
</xsd:all>
</xsd:complexType>

<xsd:complexType name="messenger_routing">
<xsd:sequence>
<xsd:element name="sender" type="messenger_routing_sender" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="messenger_routing_sender">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="message-class" type="xsd:string" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>

<xsd:complexType name="messenger_doctrine_transaction">
<xsd:sequence>
<xsd:element name="entity-manager-name" type="xsd:string" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one could be an attribute rather than a child element IMO

Copy link
Member Author
@Nyholm Nyholm Mar 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please assist me here? I've had a hard time making this work. That is why the tests are failing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last thing I guess: can you move this to be an attribute? It would mean this XML would look like that instead:

    <framework:config>
        <framework:messenger>
            <framework:doctrine-transaction entity-manager-name="foobar" />
        </framework:messenger>
    </framework:config>

</xsd:sequence>
<xsd:attribute name="enabled" type="xsd:boolean" />
</xsd:complexType>
</xsd:schema>
5 changes: 4 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

$container->loadFromExtension('framework', array(
'messenger' => array(
'enabled' => true,
'routing' => [
'App\Foo' => 'sender.foo',
'App\Bar' => 'sender.bar',
],
),
));
6 changes: 6 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,11 @@
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger>
<framework:routing>
<framework:sender message-class="App\Foo">sender.foo</framework:sender>
<framework:sender message-class="App\Bar">sender.bar</framework:sender>
</framework:routing>
</framework:messenger>
</framework:config>
</container>
2 changes: 1 addition & 1 deletion ...fony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_doctrine.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:messenger>
<framework:doctrine-transaction >
<framework:doctrine-transaction>
<framework:entity-manager-name>foobar</framework:entity-manager-name>
</framework:doctrine-transaction>
</framework:messenger>
Expand Down
5 changes: 4 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
framework:
messenger: ~
messenger:
routing:
'App\Foo': 'sender.foo'
'App\Bar': 'sender.bar'
0