diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed previous merge (refs #8635)

Browse Source
This commit is contained in:
Fabien Potencier 2013-09-18 14:22:34 +02:00
parent 7005cf5e71
commit 4705e6f7cc
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
View File

@ -14,6 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper; use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper;
use Symfony\Component\Config\Definition\Dumper\XmlReferenceDumper; use Symfony\Component\Config\Definition\Dumper\XmlReferenceDumper;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Config\Definition\ConfigurationInterface; use Symfony\Component\Config\Definition\ConfigurationInterface;
@ -34,25 +35,21 @@ class ConfigDumpReferenceCommand extends ContainerDebugCommand
$this $this
->setName('config:dump-reference') ->setName('config:dump-reference')
->setDefinition(array( ->setDefinition(array(
new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle or extension alias'), new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The format, either yaml or xml', 'yaml'), new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The format, either yaml or xml', 'yaml'),
)) ))
->setDescription('Dumps default configuration for an extension') ->setDescription('Dumps the default configuration for an extension')
->setHelp(<<<EOF ->setHelp(<<<EOF
The <info>%command.name%</info> command dumps the default configuration for an extension/bundle. The <info>%command.name%</info> command dumps the default configuration for an
extension/bundle.
The extension alias or bundle name can be used: The extension alias or bundle name can be used:
Example:
<info>php %command.full_name% framework</info> <info>php %command.full_name% framework</info>
or
<info>php %command.full_name% FrameworkBundle</info> <info>php %command.full_name% FrameworkBundle</info>
With the <info>format</info> option specifies the format of the configuration, this is either yaml With the <info>format</info> option specifies the format of the configuration,
or xml. When the option is not provided, yaml is used. this is either <comment>yaml</comment> or <comment>xml</comment>. When the option is not provided, <comment>yaml</comment> is used.
EOF EOF
) )
; ;
@ -122,16 +119,17 @@ EOF
throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', get_class($configuration))); throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', get_class($configuration)));
} }
$output->writeln($message);
switch ($input->getOption('format')) { switch ($input->getOption('format')) {
case 'yaml': case 'yaml':
$output->writeln(sprintf('# %s', $message));
$dumper = new YamlReferenceDumper(); $dumper = new YamlReferenceDumper();
break; break;
case 'xml': case 'xml':
$output->writeln(sprintf('<!-- %s -->', $message));
$dumper = new XmlReferenceDumper(); $dumper = new XmlReferenceDumper();
break; break;
default: default:
$output->writeln($message);
throw new \InvalidArgumentException('Only the yaml and xml formats are supported.'); throw new \InvalidArgumentException('Only the yaml and xml formats are supported.');
} }

2
src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
View File

@ -44,7 +44,7 @@ class XmlReferenceDumper
/** /**
* @param NodeInterface $node * @param NodeInterface $node
* @param integer $depth * @param integer $depth
* @param boolean $root If the node is the root node * @param Boolean $root If the node is the root node
* @param string $namespace The namespace of the node * @param string $namespace The namespace of the node
*/ */
private function writeNode(NodeInterface $node, $depth = 0, $root = false, $namespace = null) private function writeNode(NodeInterface $node, $depth = 0, $root = false, $namespace = null)