[FrameworkBundle] Simplify marking store configuration

Author: nicolas-grekas

DependencyInjection/Configuration.php

@@ -406,7 +406,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                 ->values(['method'])
                                             ->end()
                                             ->scalarNode('property')
-                                                ->defaultValue('marking')
+                                                ->cannotBeEmpty()
                                             ->end()
                                             ->scalarNode('service')
                                                 ->cannotBeEmpty()

DependencyInjection/FrameworkExtension.php

@@ -998,11 +998,11 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             // Create MarkingStore
             $markingStoreDefinition = null;
-            if (isset($workflow['marking_store']['type'])) {
+            if (isset($workflow['marking_store']['type']) || isset($workflow['marking_store']['property'])) {
                 $markingStoreDefinition = new ChildDefinition('workflow.marking_store.method');
                 $markingStoreDefinition->setArguments([
                     'state_machine' === $type, // single state
-                    $workflow['marking_store']['property'],
+                    $workflow['marking_store']['property'] ?? 'marking',
                 ]);
             } elseif (isset($workflow['marking_store']['service'])) {
                 $markingStoreDefinition = new Reference($workflow['marking_store']['service']);

Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php

@@ -9,7 +9,6 @@
         'my_workflow' => [
             'type' => 'state_machine',
             'marking_store' => [
-                'type' => 'method',
                 'property' => 'state',
             ],
             'supports' => [

Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml

@@ -10,7 +10,7 @@
         <framework:annotations enabled="false" />
         <framework:workflow name="my_workflow" type="state_machine">
             <framework:initial-marking>one</framework:initial-marking>
-            <framework:marking-store type="method" property="state" />
+            <framework:marking-store property="state" />
             <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:event-to-dispatch>workflow.leave</framework:event-to-dispatch>
             <framework:event-to-dispatch>workflow.completed</framework:event-to-dispatch>

Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml

@@ -7,7 +7,6 @@ framework:
             initial_marking: one
             events_to_dispatch: ['workflow.leave', 'workflow.completed']
             marking_store:
-                type: method
                 property: state
             supports:
                 - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase