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

[Console] Added current style appliance for all styled text.

This commit is contained in:
Jean-François Simon 2012-08-06 21:23:53 +02:00
parent 696a65370e
commit c0c61da0be
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/Console/Formatter/OutputFormatter.php
View File

@ -171,7 +171,7 @@ class OutputFormatter implements OutputFormatterInterface
{
// we got "\<" escaped char
if ('\\' === $match[1]) {
return $match[0];
return $this->applyCurrentStyle($match[0]);
}
if ('' === $match[3]) {
@ -179,11 +179,11 @@ class OutputFormatter implements OutputFormatterInterface
// we got "</>" tag
$this->styleStack->pop();
return $this->applyStyle($this->styleStack->getCurrent(), $match[4]);
return $this->applyCurrentStyle($match[4]);
}
// we got "<>" tag
return '<>'.$match[4];
return '<>'.$this->applyCurrentStyle($match[4]);
}
if (isset($this->styles[strtolower($match[3])])) {
@ -192,7 +192,7 @@ class OutputFormatter implements OutputFormatterInterface
$style = $this->createStyleFromString($match[3]);
if (false === $style) {
return $match[0];
return $this->applyCurrentStyle($match[0]);
}
}
@ -202,7 +202,7 @@ class OutputFormatter implements OutputFormatterInterface
$this->styleStack->push($style);
}
return $this->applyStyle($this->styleStack->getCurrent(), $match[4]);
return $this->applyCurrentStyle($match[4]);
}
/**
@ -235,15 +235,14 @@ class OutputFormatter implements OutputFormatterInterface
}
/**
* Applies style to text if must be applied.
* Applies current style from stack to text, if must be applied.
*
* @param OutputFormatterStyleInterface $style Style to apply
* @param string $text Input text
* @param string $text Input text
*
* @return string string Styled text
*/
private function applyStyle(OutputFormatterStyleInterface $style, $text)
private function applyCurrentStyle($text)
{
return $this->isDecorated() && strlen($text) > 0 ? $style->apply($text) : $text;
return $this->isDecorated() && strlen($text) > 0 ? $this->styleStack->getCurrent()->apply($text) : $text;
}
}