RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Merging some fixes to Symfony Console component

Browse source
This commit is contained in:
Jonathan H. Wage 2010-04-16 13:21:16 -04:00
parent 59f3fe3a40
commit efb33a8365
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vendor/Symfony/Components/Console/Application.php vendored
View file

@ -488,7 +488,7 @@ class Application
{ {
// namespace // namespace
$namespace = ''; $namespace = '';
if (false !== $pos = strpos($name, ':')) if (false !== $pos = strrpos($name, ':'))
{ {
$namespace = $this->findNamespace(substr($name, 0, $pos)); $namespace = $this->findNamespace(substr($name, 0, $pos));
$name = substr($name, $pos + 1); $name = substr($name, $pos + 1);

26
lib/vendor/Symfony/Components/Console/Command/Command.php vendored
View file

@ -276,7 +276,7 @@ class Command
*/ */
public function setName($name) public function setName($name)
{ {
if (false !== $pos = strpos($name, ':')) if (false !== $pos = strrpos($name, ':'))
{ {
$namespace = substr($name, 0, $pos); $namespace = substr($name, 0, $pos);
$name = substr($name, $pos + 1); $name = substr($name, $pos + 1);
@ -375,6 +375,28 @@ class Command
return $this->help; return $this->help;
} }
/**
* Returns the processed help for the command replacing the %command.name% and
* %command.full_name% patterns with the real values dynamically.
*
* @return string The processed help for the command
*/
public function getProcessedHelp()
{
$name = $this->namespace.':'.$this->name;
$placeholders = array(
'%command.name%',
'%command.full_name%'
);
$replacements = array(
$name,
$_SERVER['PHP_SELF'].' '.$name
);
return str_replace($placeholders, $replacements, $this->getHelp());
}
/** /**
* Sets the aliases for the command. * Sets the aliases for the command.
* *
@ -457,7 +479,7 @@ class Command
$messages[] = $this->definition->asText(); $messages[] = $this->definition->asText();
if ($help = $this->getHelp()) if ($help = $this->getProcessedHelp())
{ {
$messages[] = '<comment>Help:</comment>'; $messages[] = '<comment>Help:</comment>';
$messages[] = ' '.implode("\n ", explode("\n", $help))."\n"; $messages[] = ' '.implode("\n ", explode("\n", $help))."\n";

2
lib/vendor/Symfony/Components/Console/Input/ArgvInput.php vendored
View file

@ -70,7 +70,7 @@ class ArgvInput extends Input
protected function parse() protected function parse()
{ {
$this->parsed = $this->tokens; $this->parsed = $this->tokens;
while ($token = array_shift($this->parsed)) while (null !== ($token = array_shift($this->parsed)))
{ {
if ('--' === substr($token, 0, 2)) if ('--' === substr($token, 0, 2))
{ {