bug #31537 [Workflow] use method marking store (noniagriconomie)

nicolas-grekas · nicolas-grekas · commit 86bc1be2cfd5 · 2019-05-20T13:44:45.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Workflow] use method marking store | Q | A | ------------- | --- | Branch? | 4.3 (related to deprecation of single/multiple marking store) | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | . | License | MIT | Doc PR | already documented I think the deprecation of old marking store, the single one in the statemachine, was not patched here Or did i miss something? Thank you Cc @lyrixx Commits ------- a219167 [Workflow] use method marking store
diff --git a/src/Symfony/Component/Workflow/StateMachine.php b/src/Symfony/Component/Workflow/StateMachine.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Workflow;
 
 use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface;
-use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore;
+use Symfony\Component\Workflow\MarkingStore\MethodMarkingStore;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -22,6 +22,6 @@ class StateMachine extends Workflow
 {
     public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed')
     {
-        parent::__construct($definition, $markingStore ?: new SingleStateMarkingStore(), $dispatcher, $name);
+        parent::__construct($definition, $markingStore ?: new MethodMarkingStore(true, 'marking'), $dispatcher, $name);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Workflow;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface;`
`15`		`-use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore;`
	`15`	`+use Symfony\Component\Workflow\MarkingStore\MethodMarkingStore;`
`16`	`16`	`use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;`
`17`	`17`
`18`	`18`	`/**`
`@@ -22,6 +22,6 @@ class StateMachine extends Workflow`
`22`	`22`	`{`
`23`	`23`	`public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed')`
`24`	`24`	`{`
`25`		`- parent::__construct($definition, $markingStore ?: new SingleStateMarkingStore(), $dispatcher, $name);`
	`25`	`+ parent::__construct($definition, $markingStore ?: new MethodMarkingStore(true, 'marking'), $dispatcher, $name);`
`26`	`26`	`}`
`27`	`27`	`}`