[Workflow] Added a context to Workflow::apply()

lyrixx · lyrixx · commit b087c0a80181 · 2018-11-08T17:30:04.000+01:00
diff --git a/src/Symfony/Component/Workflow/CHANGELOG.md b/src/Symfony/Component/Workflow/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.3.0
+-----
+
+* [Workflow] Added a context to `Workflow::apply()`
+
 4.1.0
 -----
 
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php b/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
@@ -37,7 +37,6 @@ public function getMarking($subject);
      * Sets a Marking to a subject.
      *
      * @param object  $subject A subject
-     * @param Marking $marking A marking
      */
-    public function setMarking($subject, Marking $marking);
+    public function setMarking($subject, Marking $marking, array $context = array());
 }
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
@@ -46,7 +46,7 @@ public function getMarking($subject)
     /**
      * {@inheritdoc}
      */
-    public function setMarking($subject, Marking $marking)
+    public function setMarking($subject, Marking $marking, array $context = array())
     {
         $this->propertyAccessor->setValue($subject, $this->property, $marking->getPlaces());
     }
diff --git a/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
@@ -51,7 +51,7 @@ public function getMarking($subject)
     /**
      * {@inheritdoc}
      */
-    public function setMarking($subject, Marking $marking)
+    public function setMarking($subject, Marking $marking, array $context = array())
     {
         $this->propertyAccessor->setValue($subject, $this->property, key($marking->getPlaces()));
     }
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
@@ -133,7 +133,7 @@ public function buildTransitionBlockerList($subject, string $transitionName): Tr
     /**
      * {@inheritdoc}
      */
-    public function apply($subject, $transitionName)
+    public function apply($subject, $transitionName, array $context = array())
     {
         $marking = $this->getMarking($subject);
 
@@ -162,7 +162,7 @@ public function apply($subject, $transitionName)
 
             $this->enter($subject, $transition, $marking);
 
-            $this->markingStore->setMarking($subject, $marking);
+            $this->markingStore->setMarking($subject, $marking, $context);
 
             $this->entered($subject, $transition, $marking);
 
diff --git a/src/Symfony/Component/Workflow/WorkflowInterface.php b/src/Symfony/Component/Workflow/WorkflowInterface.php
@@ -58,7 +58,7 @@ public function buildTransitionBlockerList($subject, string $transitionName): Tr
      *
      * @throws LogicException If the transition is not applicable
      */
-    public function apply($subject, $transitionName);
+    public function apply($subject, $transitionName, array $context = array());
 
     /**
      * Returns all enabled transitions.

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public function getMarking($subject);`
`37`	`37`	`* Sets a Marking to a subject.`
`38`	`38`	`*`
`39`	`39`	`* @param object $subject A subject`
`40`		`- * @param Marking $marking A marking`
`41`	`40`	`*/`
`42`		`- public function setMarking($subject, Marking $marking);`
	`41`	`+ public function setMarking($subject, Marking $marking, array $context = array());`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getMarking($subject)`
`46`	`46`	`/**`
`47`	`47`	`* {@inheritdoc}`
`48`	`48`	`*/`
`49`		`- public function setMarking($subject, Marking $marking)`
	`49`	`+ public function setMarking($subject, Marking $marking, array $context = array())`
`50`	`50`	`{`
`51`	`51`	`$this->propertyAccessor->setValue($subject, $this->property, $marking->getPlaces());`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getMarking($subject)`
`51`	`51`	`/**`
`52`	`52`	`* {@inheritdoc}`
`53`	`53`	`*/`
`54`		`- public function setMarking($subject, Marking $marking)`
	`54`	`+ public function setMarking($subject, Marking $marking, array $context = array())`
`55`	`55`	`{`
`56`	`56`	`$this->propertyAccessor->setValue($subject, $this->property, key($marking->getPlaces()));`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function buildTransitionBlockerList($subject, string $transitionName): Tr`
`58`	`58`	`*`
`59`	`59`	`* @throws LogicException If the transition is not applicable`
`60`	`60`	`*/`
`61`		`- public function apply($subject, $transitionName);`
	`61`	`+ public function apply($subject, $transitionName, array $context = array());`
`62`	`62`
`63`	`63`	`/**`
`64`	`64`	`* Returns all enabled transitions.`