Merge branch '6.2' into 6.3

* 6.2:
  [Serializer] Fix SerializedPath not working with constructor arguments
  [FrameworkBundle] Fix Workflow without a marking store definition uses marking store definition of previously defined workflow
  [HttpFoundation] UrlHelper is now aware of RequestContext changes
  UrlHelper is now aware of RequestContext changes
  [Process] Stop the process correctly even if underlying input stream is not closed:
  Fix get sender name in turbosms notifier
  [Notifier] Update AmazonSns url in doc from de to en
  [PropertyInfo] Fix `PhpStanExtractor` when constructor has no docblock
  [PropertyAccess] Fix nullsafe operator on array index

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -990,6 +990,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $definitionDefinition->addArgument(new Reference(sprintf('%s.metadata_store', $workflowId)));
 
             // Create MarkingStore
+            $markingStoreDefinition = null;
             if (isset($workflow['marking_store']['type'])) {
                 $markingStoreDefinition = new ChildDefinition('workflow.marking_store.method');
                 $markingStoreDefinition->setArguments([
@@ -1003,7 +1004,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             // Create Workflow
             $workflowDefinition = new ChildDefinition(sprintf('%s.abstract', $type));
             $workflowDefinition->replaceArgument(0, new Reference(sprintf('%s.definition', $workflowId)));
-            $workflowDefinition->replaceArgument(1, $markingStoreDefinition ?? null);
+            $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             $workflowDefinition->replaceArgument(3, $name);
             $workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
 

Resources/config/services.php

@@ -120,7 +120,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
         ->set('url_helper', UrlHelper::class)
             ->args([
                 service('request_stack'),
-                service('router.request_context')->ignoreOnInvalid(),
+                service('router')->ignoreOnInvalid(),
             ])
         ->alias(UrlHelper::class, 'url_helper')
 

Tests/DependencyInjection/PhpFrameworkExtensionTest.php

@@ -88,6 +88,62 @@ public function testWorkflowValidationStateMachine()
         });
     }
 
+    public function testWorkflowDefaultMarkingStoreDefinition()
+    {
+        $container = $this->createContainerFromClosure(function ($container) {
+            $container->loadFromExtension('framework', [
+                'workflows' => [
+                    'workflow_a' => [
+                        'type' => 'state_machine',
+                        'marking_store' => [
+                            'type' => 'method',
+                            'property' => 'status',
+                        ],
+                        'supports' => [
+                            __CLASS__,
+                        ],
+                        'places' => [
+                            'a',
+                            'b',
+                        ],
+                        'transitions' => [
+                            'a_to_b' => [
+                                'from' => ['a'],
+                                'to' => ['b'],
+                            ],
+                        ],
+                    ],
+                    'workflow_b' => [
+                        'type' => 'state_machine',
+                        'supports' => [
+                            __CLASS__,
+                        ],
+                        'places' => [
+                            'a',
+                            'b',
+                        ],
+                        'transitions' => [
+                            'a_to_b' => [
+                                'from' => ['a'],
+                                'to' => ['b'],
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+        });
+
+        $workflowA = $container->getDefinition('state_machine.workflow_a');
+        $argumentsA = $workflowA->getArguments();
+        $this->assertArrayHasKey('index_1', $argumentsA, 'workflow_a has a marking_store argument');
+        $this->assertNotNull($argumentsA['index_1'], 'workflow_a marking_store argument is not null');
+
+        $workflowB = $container->getDefinition('state_machine.workflow_b');
+        $argumentsB = $workflowB->getArguments();
+        $this->assertArrayHasKey('index_1', $argumentsB, 'workflow_b has a marking_store argument');
+        $this->assertNull($argumentsB['index_1'], 'workflow_b marking_store argument is null');
+    }
+
     public function testRateLimiterWithLockFactory()
     {
         try {