Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] fixed container:debug and router:debug commands #9195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 2, 2013
Merged

[FrameworkBundle] fixed container:debug and router:debug commands #9195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d997dfa
[FrameworkBundle] fixed container:debug and router:debug commands
fabpot Oct 2, 2013
1d210f8
[FrameworkBundle] changed the router:debug to use the shortcut notati…
fabpot Oct 2, 2013
bd16157
[FrameworkBundle] changed JSON descriptors to be more readable on PHP…
fabpot Oct 2, 2013
fe5961a
[FrameworkBundle] moved router:debug and container:debug to use the c…
fabpot Oct 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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);
}

/**
Expand Down
26 changes: 24 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -80,14 +81,35 @@ 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'),
'show_controllers' => $input->getOption('show-controllers'),
));
}
}

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) {
}
}
}
}
6 changes: 5 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}

/**
Expand Down
16 changes: 9 additions & 7 deletions src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
}
$this->describeRoute($route, array('name' => $name));
}
$this->write("\n");
}

/**
Expand All @@ -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");
}

/**
Expand Down Expand Up @@ -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));
}
}
Expand Down Expand Up @@ -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);
}

/**
Expand All @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}
Expand Down Expand Up @@ -84,7 +82,7 @@ protected function describeRoute(Route $route, array $options = array())
$description[] = '<comment>Host-Regex</comment> '.$route->compile()->getHostRegex();
}

$this->writeText(implode("\n", $description), $options);
$this->writeText(implode("\n", $description)."\n", $options);
}

/**
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -256,7 +256,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
$description[] = sprintf('<comment>Synthetic</comment> %s', $definition->isSynthetic() ? 'yes' : 'no');
$description[] = sprintf('<comment>Required File</comment> %s', $definition->getFile() ? $definition->getFile() : '-');

$this->writeText(implode("\n", $description), $options);
$this->writeText(implode("\n", $description)."\n", $options);
}

/**
Expand Down