[WIP][Workflow] Changed initial_places to initial_marking, added property instead of type #30662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@HeahDude Hi. Thanks for the PR. What is missing? Do you think you will be able to finish it before the feature freeze? |
|
Hey!
I need to fix the CI and get your approval :). Is the naming ok? I'm not sure about the deprecation messages, I surely need to update the changelog and upgrade files about them and the
Sure, if you ask me, I would love to have it merged for tomorrow :). |
HeahDude
commented
Mar 25, 2019
| </xsd:complexType> | ||
|
|
||
| <xsd:simpleType name="marking_store_type"> | ||
| <xsd:restriction base="xsd:string"> | ||
| <xsd:enumeration value="multiple_state" /> | ||
| <xsd:enumeration value="single_state" /> | ||
| <xsd:enumeration value="method" /> |
There was a problem hiding this comment.
This is a kind of bug fix
HeahDude
force-pushed
the
workflow/default-config
branch
from
0737d3e
to
95bc4ef
Compare
|
Missing "method" value ;) |
lyrixx
reviewed
Mar 26, 2019
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Show resolved
Hide resolved
| if ('method' === $workflow['marking_store']['type']) { | ||
| $markingStoreDefinition->setArguments([ | ||
| 'state_machine' === $type, //single state | ||
| $workflow['marking_store']['property'] ?? 'marking', |
There was a problem hiding this comment.
This should be the default value in the Configuration (not the extension)
| @@ -270,7 +270,7 @@ | |||
|
|
|||
| <xsd:complexType name="workflow"> | |||
| <xsd:sequence> | |||
| <xsd:element name="initial-place" type="xsd:string" minOccurs="0" maxOccurs="unbounded" /> | |||
| <xsd:element name="initial-marking" type="xsd:string" minOccurs="0" maxOccurs="unbounded" /> | |||
There was a problem hiding this comment.
both element should be here to support the BC, no ?
|
@HeahDude I could finish this PR. Are you OK with that? |
|
Yes please do! |
|
Thank you very much for you initial work on this PR. |
fabpot
added a commit
that referenced
this pull request
Apr 6, 2019
…added property (HeahDude, lyrixx) This PR was merged into the 4.3-dev branch. Discussion ---------- [Workflow] Changed initial_places to initial_marking, added property | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | #30662 and #30656 | License | MIT | Doc PR | #30656 EUFOSSA --- * [Workflow] Changed initial_places to initial_marking, added property instead of type * [Workflow] Finished integration of initial_marking + deprecated support for workflow + single state markin store [Workflow] Deprecate worflow and single state marking --- Here is an exemple of deprecation: ``` 3x: Passing something else than "method" has been deprecated in Symfony 4.3. 1x in PhpFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in XmlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in YamlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 3x: The "framework.workflows.workflows.legacy.marking_store.arguments" configuration key has been deprecated in Symfony 4.3. Use "property" instead. 1x in PhpFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in XmlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in YamlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 3x: The "framework.workflows.workflows.legacy.initial_place" configuration key has been deprecated in Symfony 4.3, use the "initial_marking" configuration key instead. 1x in PhpFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in XmlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection 1x in YamlFrameworkExtensionTest::testWorkflowLegacy from Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection ``` Commits ------- 0393535 [Workflow] Deprecate worflow and single state marking 87839cf [Workflow] Finished integration of initial_marking + deprecated support for workflow + single state markin store 73708a6 [Workflow] Changed initial_places to initial_marking, added property instead of type
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ping @lyrixx