[Workflow] Remove unnecessary method calls #21784
Closed
Conversation
This file contains hidden or 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
getEnabledTransitions() method only requires 1 parameter "$subject". Removed instances where a second $this->getMarking($subject) is being passed to getEnabledTransitions().
|
Looks like you opened your PR against the wrong branch or forgot to rebase it. |
MarkingStore->setMarking() is being called on every call to getMarking() in the Workflow class. This is only required if a new Marking is initialised and set as per line 63: `$marking->mark($this->definition->getInitialPlace());` If the Marking is not new, the subject either already has a marking and we don't need to call setMarking(), or it is new && theres no `initial place`. In that case an Exception is thrown on line 61.
|
ping @lyrixx |
Comply with Coding Standard.
lyrixx
approved these changes
Feb 27, 2017
| @@ -61,6 +61,9 @@ public function getMarking($subject) | |||
| throw new LogicException(sprintf('The Marking is empty and there is no initial place for workflow "%s".', $this->name)); | |||
| } | |||
| $marking->mark($this->definition->getInitialPlace()); | |||
|
|
|||
| // Because the marking could have been initialized, we update the subject | |||
There was a problem hiding this comment.
I would remove this comment because now, it's clear the marking has been updated.
There was a problem hiding this comment.
comment updated in 7edad79.
|
👍 |
|
Q: how often do you release patches? Is there a specific timeline for v3.2.5? (new to symfony dev cycle, couldn't find this detailed anywhere..) |
|
@izzyp we do patch releases once a month (except when a security issue requires us to release an extra one faster) |
|
Thank you @izzyp. |
nicolas-grekas
added a commit
that referenced
this pull request
Feb 28, 2017
This PR was submitted for the master branch but it was merged into the 3.2 branch instead (closes #21784). Discussion ---------- [Workflow] Remove unnecessary method calls | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | License | MIT getEnabledTransitions() method only requires 1 parameter "$subject". Removed places where a second parameter "$this->getMarking($subject)" is being passed to getEnabledTransitions(). <!-- - Bug fixes must be submitted against the lowest branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against the master branch. - Please fill in this template according to the PR you're about to submit. - Replace this comment by a description of what your PR is solving. --> Commits ------- 12d9129 [Workflow] Remove unnecessary method calls
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.
getEnabledTransitions() method only requires 1 parameter "$subject".
Removed places where a second parameter "$this->getMarking($subject)" is being passed to getEnabledTransitions().