Skip to content
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

Jump to bottom

[2.1] Added missing error return codes in commands #5586

Closed
wants to merge 3 commits into from
Closed

[2.1] Added missing error return codes in commands #5586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f91fc01
[FrameworkBundle] Added missing return codes to commands
hason Sep 24, 2012
adf0c0f
[SecurityBundle] Added missing return codes to commands
hason Sep 21, 2012
56a62e1
[TwigBundle] Fixed return code in lint command
hason Sep 21, 2012
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
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ protected function execute(InputInterface $input, OutputInterface $output)


if (!$matches) { if (!$matches) {
$output->writeln('<fg=red>None of the routes matches</>'); $output->writeln('<fg=red>None of the routes matches</>');

return 1;
} }
} }
} }
8 changes: 6 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
*/ */
class TranslationUpdateCommand extends ContainerAwareCommand class TranslationUpdateCommand extends ContainerAwareCommand
{ {
const RETURN_CODE_MISSING_OPTIONS = 1;

const RETURN_CODE_UNSUPPORTED_FORMAT = 2;

/** /**
* Compiled catalogue of messages. * Compiled catalogue of messages.
* @var MessageCatalogue * @var MessageCatalogue
Expand Down Expand Up @@ -82,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) { if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) {
$output->writeln('<info>You must choose one of --force or --dump-messages</info>'); $output->writeln('<info>You must choose one of --force or --dump-messages</info>');


return; return self::RETURN_CODE_MISSING_OPTIONS;
} }


// check format // check format
Expand All @@ -92,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$output->writeln('<error>Wrong output format</error>'); $output->writeln('<error>Wrong output format</error>');
$output->writeln('Supported formats are '.implode(', ', $supportedFormats).'.'); $output->writeln('Supported formats are '.implode(', ', $supportedFormats).'.');


return; return self::RETURN_CODE_UNSUPPORTED_FORMAT;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hason please change it to return 1 in both cases as returning 2 is wrong according to its meaning

} }


// get bundle directory // get bundle directory
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
} catch (SchemaException $e) { } catch (SchemaException $e) {
$output->writeln("Aborting: " . $e->getMessage()); $output->writeln("Aborting: " . $e->getMessage());


return; return 1;
} }


foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) { foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) {
Expand Down
44 changes: 28 additions & 16 deletions src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$template .= fread(STDIN, 1024); $template .= fread(STDIN, 1024);
} }


return $twig->parse($twig->tokenize($template)); return $this->validateTemplate($twig, $output, $template);
} }


if (0 !== strpos($filename, '@') && !is_readable($filename)) { if (0 !== strpos($filename, '@') && !is_readable($filename)) {
Expand All @@ -87,26 +87,39 @@ protected function execute(InputInterface $input, OutputInterface $output)
$files = Finder::create()->files()->in($dir)->name('*.twig'); $files = Finder::create()->files()->in($dir)->name('*.twig');
} }


$error = false; $errors = 0;
foreach ($files as $file) { foreach ($files as $file) {
try { $errors += $this->validateTemplate($twig, $output, file_get_contents($file), $file);
$twig->parse($twig->tokenize(file_get_contents($file), (string) $file)); }
$output->writeln(sprintf("<info>OK</info> in %s", $file));
} catch (\Twig_Error $e) { return $errors > 0 ? 1 : 0;
$this->renderException($output, $file, $e); }
$error = true;
} protected function validateTemplate(\Twig_Environment $twig, OutputInterface $output, $template, $file = null)
{
try {
$twig->parse($twig->tokenize($template, $file ? (string) $file : null));
$output->writeln('<info>OK</info>'.($file ? sprintf(' in %s', $file) : ''));
} catch (\Twig_Error $e) {
$this->renderException($output, $template, $e, $file);

return 1;
} }


return $error ? 1 : 0; return 0;
} }


protected function renderException(OutputInterface $output, $file, \Twig_Error $exception) protected function renderException(OutputInterface $output, $template, \Twig_Error $exception, $file = null)
{ {
$line = $exception->getTemplateLine(); $line = $exception->getTemplateLine();
$lines = $this->getContext($file, $line); $lines = $this->getContext($template, $line);

if ($file) {
$output->writeln(sprintf("<error>KO</error> in %s (line %s)", $file, $line));
} else {
$output->writeln(sprintf("<error>KO</error> (line %s)", $line));
}


$output->writeln(sprintf("<error>KO</error> in %s (line %s)", $file, $line));
foreach ($lines as $no => $code) { foreach ($lines as $no => $code) {
$output->writeln(sprintf( $output->writeln(sprintf(
"%s %-6s %s", "%s %-6s %s",
Expand All @@ -120,10 +133,9 @@ protected function renderException(OutputInterface $output, $file, \Twig_Error $
} }
} }


protected function getContext($file, $line, $context = 3) protected function getContext($template, $line, $context = 3)
{ {
$fileContent = file_get_contents($file); $lines = explode("\n", $template);
$lines = explode("\n", $fileContent);


$position = max(0, $line - $context); $position = max(0, $line - $context);
$max = min(count($lines), $line - 1 + $context); $max = min(count($lines), $line - 1 + $context);
Expand Down