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

Author: jfsimon

src/Symfony/Component/Console/Formatter/OutputFormatter.php

@@ -171,19 +171,19 @@ private function replaceStyle($match)
     {
         // we got "\<" escaped char
         if ('\\' === $match[1]) {
-            return $match[0];
+            return $this->applyCurrentStyle($match[0]);
         }
 
         if ('' === $match[3]) {
             if ('/' === $match[2]) {
                 // 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 @@ private function replaceStyle($match)
             $style = $this->createStyleFromString($match[3]);
 
             if (false === $style) {
-                return $match[0];
+                return $this->applyCurrentStyle($match[0]);
             }
         }
 
@@ -202,7 +202,7 @@ private function replaceStyle($match)
             $this->styleStack->push($style);
         }
 
-        return $this->applyStyle($this->styleStack->getCurrent(), $match[4]);
+        return $this->applyCurrentStyle($match[4]);
     }
 
     /**
@@ -235,15 +235,14 @@ private function createStyleFromString($string)
     }
 
     /**
-     * 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;
     }
 }