bug #26657 [Workflow] Fixed default parameters (lyrixx)

lyrixx · lyrixx · commit ce66ef028f28 · 2018-03-23T17:00:48.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Workflow] Fixed default parameters | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- fc303a8 [Workflow] Fixed default parameters
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -480,7 +480,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $type = $workflow['type'];
 
             // Process Metadata (workflow + places (transition is done in the "create transition" block))
-            $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, array(null, null, null));
+            $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, array(array(), array(), null));
             if ($workflow['metadata']) {
                 $metadataStoreDefinition->replaceArgument(0, $workflow['metadata']);
             }
diff --git a/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php b/src/Symfony/Component/Workflow/Metadata/InMemoryMetadataStore.php
@@ -24,7 +24,7 @@ final class InMemoryMetadataStore implements MetadataStoreInterface
     private $placesMetadata;
     private $transitionsMetadata;
 
-    public function __construct($workflowMetadata = array(), array $placesMetadata = array(), \SplObjectStorage $transitionsMetadata = null)
+    public function __construct(array $workflowMetadata = array(), array $placesMetadata = array(), \SplObjectStorage $transitionsMetadata = null)
     {
         $this->workflowMetadata = $workflowMetadata;
         $this->placesMetadata = $placesMetadata;

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $`
`480`	`480`	`$type = $workflow['type'];`
`481`	`481`
`482`	`482`	`// Process Metadata (workflow + places (transition is done in the "create transition" block))`
`483`		`- $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, array(null, null, null));`
	`483`	`+ $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, array(array(), array(), null));`
`484`	`484`	`if ($workflow['metadata']) {`
`485`	`485`	`$metadataStoreDefinition->replaceArgument(0, $workflow['metadata']);`
`486`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ final class InMemoryMetadataStore implements MetadataStoreInterface`
`24`	`24`	`private $placesMetadata;`
`25`	`25`	`private $transitionsMetadata;`
`26`	`26`
`27`		`- public function __construct($workflowMetadata = array(), array $placesMetadata = array(), \SplObjectStorage $transitionsMetadata = null)`
	`27`	`+ public function __construct(array $workflowMetadata = array(), array $placesMetadata = array(), \SplObjectStorage $transitionsMetadata = null)`
`28`	`28`	`{`
`29`	`29`	`$this->workflowMetadata = $workflowMetadata;`
`30`	`30`	`$this->placesMetadata = $placesMetadata;`