Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 256bb0b4fa8b · 2021-12-15T10:20:15.000+01:00
* 5.3:
  [HttpClient] fix segfault when canary is triggered after the curl handle is destructed
  [Workflow] Fix eventsToDispatch parameter setup for StateMachine
diff --git a/StateMachine.php b/StateMachine.php
@@ -20,8 +20,8 @@
  */
 class StateMachine extends Workflow
 {
-    public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed')
+    public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null)
     {
-        parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name);
+        parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name, $eventsToDispatch);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`*/`
`21`	`21`	`class StateMachine extends Workflow`
`22`	`22`	`{`
`23`		`- public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed')`
	`23`	`+ public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null)`
`24`	`24`	`{`
`25`		`- parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name);`
	`25`	`+ parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name, $eventsToDispatch);`
`26`	`26`	`}`
`27`	`27`	`}`