Skip to content

Commit 40e795a

Browse files
authored
fix #871 Fix state machine tag (Zales0123)
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 👋 As Sylius introduced the state machine layer abstraction with its own `sylius.state_machine` service tag, we have a little conflict of configuration, which prevents using SyliusResourceBundle with Sylius 1.13 for now 💃 (see [this issue](Sylius/Sylius#16231)) For now, I propose we change the tag in this repository to `sylius_resource.state_machine` (which is also semantically more correct), but we should probably think if there is any thing we need to do on this repo according to this state machine abstraction 🖖 Commits ------- 136d602 Fix state machine tag 3b0e2e4 Supress MissingClassConstType for now
2 parents 0c5efcf + 3b0e2e4 commit 40e795a

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

psalm.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,13 @@
120120
</errorLevel>
121121
</MethodSignatureMismatch>
122122

123+
<MissingClassConstType>
124+
<errorLevel type="suppress">
125+
<directory name="src/Bundle" />
126+
<directory name="src/Component" />
127+
</errorLevel>
128+
</MissingClassConstType>
129+
123130
<MissingParamType>
124131
<errorLevel type="suppress">
125132
<file name="src/Bundle/Routing/ResourceLoader.php" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
1515
<services>
1616
<service id="sylius.state_machine.operation" class="Sylius\Resource\StateMachine\OperationStateMachine">
17-
<argument type="tagged_locator" tag="sylius.state_machine" index-by="key" />
17+
<argument type="tagged_locator" tag="sylius_resource.state_machine" index-by="key" />
1818
</service>
1919
<service id="Sylius\Resource\StateMachine\OperationStateMachineInterface" alias="sylius.state_machine.operation" />
2020

2121
<service id="sylius.state_machine.operation.default" alias="sylius.state_machine.operation.winzou" />
2222

2323
<service id="sylius.state_machine.operation.symfony" class="Sylius\Resource\Symfony\Workflow\OperationStateMachine">
2424
<argument type="service" id="workflow.registry" on-invalid="null" />
25-
<tag name="sylius.state_machine" key="symfony" />
25+
<tag name="sylius_resource.state_machine" key="symfony" />
2626
</service>
2727

2828
<service id="sylius.state_machine.operation.winzou" class="Sylius\Resource\Winzou\StateMachine\OperationStateMachine">
2929
<argument type="service" id="sm.factory" on-invalid="null" />
30-
<tag name="sylius.state_machine" key="winzou" />
30+
<tag name="sylius_resource.state_machine" key="winzou" />
3131
</service>
3232
</services>
3333
</container>

0 commit comments

Comments
 (0)