Skip to content

Commit 7e2f214

Browse files
authored
bug #941 Fix Doctrine dependency on state processors (loic425)
This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT We also have to move doctrine-bundle on dev requirement, but maybe it will be safer to do this on 1.12 branch. Commits ------- 833f37c Fix Doctrine dependency on state processors
2 parents 543e707 + 833f37c commit 7e2f214

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

src/Bundle/Resources/config/services/integrations/doctrine.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,22 @@
1313

1414
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
1515
<services>
16-
<defaults public="true" />
17-
1816
<service id="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain"
19-
decorates="doctrine.orm.default_metadata_driver">
17+
decorates="doctrine.orm.default_metadata_driver"
18+
public="true">
2019
<argument type="service" id="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain.inner" />
2120
<argument type="service" id="sylius.resource_registry" />
2221
</service>
2322
<service id="sylius_resource.doctrine.mapping_driver_chain" alias="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain" />
23+
24+
<service id="Sylius\Resource\Doctrine\Common\State\PersistProcessor">
25+
<argument type="service" id="doctrine" />
26+
<tag name="sylius.state_processor" />
27+
</service>
28+
29+
<service id="Sylius\Resource\Doctrine\Common\State\RemoveProcessor">
30+
<argument type="service" id="doctrine" />
31+
<tag name="sylius.state_processor" />
32+
</service>
2433
</services>
2534
</container>

src/Bundle/Resources/config/services/state.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,9 @@
4444
<tag name="sylius.state_provider" />
4545
</service>
4646

47-
<service id="Sylius\Resource\Doctrine\Common\State\PersistProcessor">
48-
<argument type="service" id="doctrine" />
49-
<tag name="sylius.state_processor" />
50-
</service>
51-
52-
<service id="Sylius\Resource\Doctrine\Common\State\RemoveProcessor">
53-
<argument type="service" id="doctrine" />
54-
<tag name="sylius.state_processor" />
55-
</service>
56-
5747
<service id="Sylius\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor">
5848
<argument type="service" id="sylius.state_machine.operation" />
59-
<argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" />
49+
<argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" on-invalid="null" />
6050
<tag name="sylius.state_processor" />
6151
</service>
6252

0 commit comments

Comments
 (0)