diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index 64765c9096093..fee2c6543e306 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -46,7 +46,7 @@ protected function configure()
new InputOption('tags', null, InputOption::VALUE_NONE, 'Displays tagged services for an application'),
new InputOption('parameter', null, InputOption::VALUE_REQUIRED, 'Displays a specific parameter for an application'),
new InputOption('parameters', null, InputOption::VALUE_NONE, 'Displays parameters for an application'),
- new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output description in other formats'),
+ new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output description in other formats', 'txt'),
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
))
->setDescription('Displays current services for an application')
@@ -114,7 +114,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
}
$helper = new DescriptorHelper();
- $helper->describe($output, $object, $input->getOption('format'), $input->getOption('raw'), $options);
+ $options['format'] = $input->getOption('format');
+ $options['raw_text'] = $input->getOption('raw');
+ $helper->describe($output, $object, $options);
}
/**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index 4a4971542997c..e4b49a2679890 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -17,6 +17,7 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Route;
/**
* A console command for retrieving information about routes
@@ -52,7 +53,7 @@ protected function configure()
->setDefinition(array(
new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
- new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output route(s) in other formats'),
+ new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output route(s) in other formats', 'txt'),
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
))
->setDescription('Displays current routes for an application')
@@ -80,9 +81,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
if (!$route) {
throw new \InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
}
- $helper->describe($output, $route, $input->getOption('format'), $input->getOption('raw'), array('name' => $name));
+ $this->convertController($route);
+ $helper->describe($output, $route, array(
+ 'format' => $input->getOption('format'),
+ 'raw_text' => $input->getOption('raw'),
+ 'name' => $name,
+ ));
} else {
$routes = $this->getContainer()->get('router')->getRouteCollection();
+
+ foreach ($routes as $route) {
+ $this->convertController($route);
+ }
+
$helper->describe($output, $routes, array(
'format' => $input->getOption('format'),
'raw_text' => $input->getOption('raw'),
@@ -90,4 +101,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
));
}
}
+
+ private function convertController(Route $route)
+ {
+ $nameParser = $this->getContainer()->get('controller_name_converter');
+ if ($route->hasDefault('_controller')) {
+ try {
+ $route->setDefault('_controller', $nameParser->build($route->getDefault('_controller')));
+ } catch (\InvalidArgumentException $e) {
+ }
+ }
+ }
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index bfd71972cf334..81315a62f1940 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -2,6 +2,10 @@
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
+if (!defined('JSON_PRETTY_PRINT')) {
+ define('JSON_PRETTY_PRINT', 128);
+}
+
use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
@@ -131,7 +135,7 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
*/
private function writeData(array $data, array $options)
{
- $this->write(json_encode($data, isset($options['json_encoding']) ? $options['json_encoding'] : 0));
+ $this->write(json_encode($data, (isset($options['json_encoding']) ? $options['json_encoding'] : 0) | JSON_PRETTY_PRINT)."\n");
}
/**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index d3210e0c61d25..c2a7bb1ebb55b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -28,6 +28,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
}
$this->describeRoute($route, array('name' => $name));
}
+ $this->write("\n");
}
/**
@@ -49,8 +50,9 @@ protected function describeRoute(Route $route, array $options = array())
."\n".'- Path-Regex: '.$route->compile()->getRegex();
$this->write(isset($options['name'])
- ? $options['name']."\n".str_repeat('-', strlen($options['name']))."\n".$output
+ ? $options['name']."\n".str_repeat('-', strlen($options['name']))."\n\n".$output
: $output);
+ $this->write("\n");
}
/**
@@ -133,17 +135,17 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
}
if (!empty($services['definitions'])) {
- $this->write("\n\nDefinitions\n-----------");
+ $this->write("\n\nDefinitions\n-----------\n");
foreach ($services['definitions'] as $id => $service) {
- $this->write("\n\n");
+ $this->write("\n");
$this->describeContainerDefinition($service, array('id' => $id));
}
}
if (!empty($services['aliases'])) {
- $this->write("\n\nAliases\n-------");
+ $this->write("\n\nAliases\n-------\n");
foreach ($services['aliases'] as $id => $service) {
- $this->write("\n\n");
+ $this->write("\n");
$this->describeContainerAlias($service, array('id' => $id));
}
}
@@ -182,7 +184,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
}
}
- $this->write(isset($options['id']) ? sprintf("**`%s`:**\n%s", $options['id'], $output) : $output);
+ $this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
}
/**
@@ -193,7 +195,7 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
$output = '- Service: `'.$alias.'`'
."\n".'- Public: '.($alias->isPublic() ? 'yes' : 'no');
- $this->write(isset($options['id']) ? sprintf("**`%s`:**\n%s", $options['id'], $output) : $output);
+ $this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
}
private function formatRouterConfig(array $array)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index ce53d832044e6..15a99175f578f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -23,6 +23,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
$showControllers = isset($options['show_controllers']) && $options['show_controllers'];
$headers = array('Name', 'Method', 'Scheme', 'Host', 'Path');
$table = new TableHelper();
+ $table->setLayout(TableHelper::LAYOUT_COMPACT);
$table->setHeaders($showControllers ? array_merge($headers, array('Controller')) : $headers);
foreach ($routes->all() as $name => $route) {
@@ -35,14 +36,11 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
);
if ($showControllers) {
- $defaultData = $route->getDefaults();
- $controller = $defaultData['_controller'] ? $defaultData['_controller'] : '';
+ $controller = $route->getDefault('_controller');
if ($controller instanceof \Closure) {
$controller = 'Closure';
- } else {
- if (is_object($controller)) {
- $controller = get_class($controller);
- }
+ } elseif (is_object($controller)) {
+ $controller = get_class($controller);
}
$row[] = $controller;
}
@@ -84,7 +82,7 @@ protected function describeRoute(Route $route, array $options = array())
$description[] = 'Host-Regex '.$route->compile()->getHostRegex();
}
- $this->writeText(implode("\n", $description), $options);
+ $this->writeText(implode("\n", $description)."\n", $options);
}
/**
@@ -93,6 +91,7 @@ protected function describeRoute(Route $route, array $options = array())
protected function describeContainerParameters(ParameterBag $parameters, array $options = array())
{
$table = new TableHelper();
+ $table->setLayout(TableHelper::LAYOUT_COMPACT);
$table->setHeaders(array('Parameter', 'Value'));
foreach ($this->sortParameters($parameters) as $parameter => $value) {
@@ -193,6 +192,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
$tagsNames = array_keys($maxTags);
$table = new TableHelper();
+ $table->setLayout(TableHelper::LAYOUT_COMPACT);
$table->setHeaders(array_merge(array('Service ID'), $tagsNames, array('Scope', 'Class name')));
foreach ($this->sortServiceIds($serviceIds) as $serviceId) {
@@ -256,7 +256,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
$description[] = sprintf('Synthetic %s', $definition->isSynthetic() ? 'yes' : 'no');
$description[] = sprintf('Required File %s', $definition->getFile() ? $definition->getFile() : '-');
- $this->writeText(implode("\n", $description), $options);
+ $this->writeText(implode("\n", $description)."\n", $options);
}
/**