Update WorkflowDumpCommand.php

shdev · fabpot · commit 9d0dda3437ee · 2017-12-11T15:14:25.000-08:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,14 +1,12 @@
 CHANGELOG
 =========
 
-<<<<<<< HEAD
 4.1.0
 -----
 
  * Allowed to pass an optional `LoggerInterface $logger` instance to the `Router`
  * Added a new `parameter_bag` service with related autowiring aliases to access parameters as-a-service
  * Allowed the `Router` to work with any PSR-11 container
- * allowed to pass an optional `LoggerInterface $logger` instance to the `Router`
  * added option in workflow dump command to label graph with a custom label
 
 4.0.0
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -78,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $options = array();
         $label = $input->getOption('label');
         if (null !== $label && '' !== trim($label)) {
-            $options = array('graph' => array('label' => $input->getOption('label')));
+            $options = array('graph' => array('label' => $label));
         }
         $output->writeln($dumper->dump($workflow->getDefinition(), $marking, $options));
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`78`	`78`	`$options = array();`
`79`	`79`	5B18 `$label = $input->getOption('label');`
`80`	`80`	`if (null !== $label && '' !== trim($label)) {`
`81`		`- $options = array('graph' => array('label' => $input->getOption('label')));`
	`81`	`+ $options = array('graph' => array('label' => $label));`
`82`	`82`	`}`
`83`	`83`	`$output->writeln($dumper->dump($workflow->getDefinition(), $marking, $options));`
`84`	`84`	`}`