minor #21784 [Workflow] Remove unnecessary method calls (izzyp)

nicolas-grekas · nicolas-grekas · commit bbb17df4806b · 2017-02-28T15:33:16.000+01:00
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().  Commits ------- 12d9129 [Workflow] Remove unnecessary method calls
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
@@ -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());
+
+            // update the subject with the new marking
+            $this->markingStore->setMarking($subject, $marking);
         }
 
         // check that the subject has a known place
@@ -76,9 +79,6 @@ public function getMarking($subject)
             }
         }
 
-        // Because the marking could have been initialized, we update the subject
-        $this->markingStore->setMarking($subject, $marking);
-
         return $marking;
     }
 
@@ -92,7 +92,7 @@ public function getMarking($subject)
      */
     public function can($subject, $transitionName)
     {
-        $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));
+        $transitions = $this->getEnabledTransitions($subject);
 
         foreach ($transitions as $transition) {
             if ($transitionName === $transition->getName()) {
@@ -116,7 +116,7 @@ public function can($subject, $transitionName)
      */
     public function apply($subject, $transitionName)
     {
-        $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));
+        $transitions = $this->getEnabledTransitions($subject);
 
         // We can shortcut the getMarking method in order to boost performance,
         // since the "getEnabledTransitions" method already checks the Marking

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ public function getMarking($subject)`
`61`	`61`	`throw new LogicException(sprintf('The Marking is empty and there is no initial place for workflow "%s".', $this->name));`
`62`	`62`	`}`
`63`	`63`	`$marking->mark($this->definition->getInitialPlace());`
	`64`	`+`
	`65`	`+ // update the subject with the new marking`
	`66`	`+ $this->markingStore->setMarking($subject, $marking);`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`// check that the subject has a known place`
`@@ -76,9 +79,6 @@ public function getMarking($subject)`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`
`79`		`- // Because the marking could have been initialized, we update the subject`
`80`		`- $this->markingStore->setMarking($subject, $marking);`
`81`		`-`
`82`	`82`	`return $marking;`
`83`	`83`	`}`
`84`	`84`
`@@ -92,7 +92,7 @@ public function getMarking($subject)`
`92`	`92`	`*/`
`93`	`93`	`public function can($subject, $transitionName)`
`94`	`94`	`{`
`95`		`- $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));`
	`95`	`+ $transitions = $this->getEnabledTransitions($subject);`
`96`	`96`
`97`	`97`	`foreach ($transitions as $transition) {`
`98`	`98`	`if ($transitionName === $transition->getName()) {`
`@@ -116,7 +116,7 @@ public function can($subject, $transitionName)`
`116`	`116`	`*/`
`117`	`117`	`public function apply($subject, $transitionName)`
`118`	`118`	`{`
`119`		`- $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));`
	`119`	`+ $transitions = $this->getEnabledTransitions($subject);`
`120`	`120`
`121`	`121`	`// We can shortcut the getMarking method in order to boost performance,`
`122`	`122`	`// since the "getEnabledTransitions" method already checks the Marking`