Merge branch '2.3' into 2.4

* 2.3:
  Revert "Fix "Array was modified outside object" in ResizeFormListener."
  Added failing test
  bumped Symfony version to 2.3.11
  updated VERSION for 2.3.10
  update CONTRIBUTORS for 2.3.10
  updated CHANGELOG for 2.3.10
  [Console] removed problematic regex
  [DomCrawler] Added support for <area> tags to be treated as links
  Fix "Array was modified outside object" in ResizeFormListener.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php

Author: fabpot

Formatter/OutputFormatter.php

@@ -20,11 +20,6 @@
  */
 class OutputFormatter implements OutputFormatterInterface
 {
-    /**
-     * The pattern to phrase the format.
-     */
-    const FORMAT_PATTERN = '#(\\\\?)<(/?)([a-z][a-z0-9_=;-]*)?>((?: [^<\\\\]+ | (?!<(?:/?[a-z]|/>)). | .(?<=\\\\<) )*)#isx';
-
     private $decorated;
     private $styles = array();
     private $styleStack;
@@ -147,9 +142,43 @@ public function getStyle($name)
      */
     public function format($message)
     {
-        $message = preg_replace_callback(self::FORMAT_PATTERN, array($this, 'replaceStyle'), $message);
+        $offset = 0;
+        $output = '';
+        $tagRegex = '[a-z][a-z0-9_=;-]*';
+        preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#isx", $message, $matches, PREG_OFFSET_CAPTURE);
+        foreach ($matches[0] as $i => $match) {
+            $pos = $match[1];
+            $text = $match[0];
+
+            // add the text up to the next tag
+            $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset));
+            $offset = $pos + strlen($text);
+
+            // opening tag?
+            if ($open = '/' != $text[1]) {
+                $tag = $matches[1][$i][0];
+            } else {
+                $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';
+            }
+
+            if (!$open && !$tag) {
+                // </>
+                $this->styleStack->pop();
+            } elseif ($pos && '\\' == $message[$pos - 1]) {
+                // escaped tag
+                $output .= $this->applyCurrentStyle($text);
+            } elseif (false === $style = $this->createStyleFromString(strtolower($tag))) {
+                $output .= $this->applyCurrentStyle($text);
+            } elseif ($open) {
+                $this->styleStack->push($style);
+            } else {
+                $this->styleStack->pop($style);
+            }
+        }
+
+        $output .= $this->applyCurrentStyle(substr($message, $offset));
 
-        return str_replace('\\<', '<', $message);
+        return str_replace('\\<', '<', $output);
     }
 
     /**
@@ -160,53 +189,6 @@ public function getStyleStack()
         return $this->styleStack;
     }
 
-    /**
-     * Replaces style of the output.
-     *
-     * All escaped tags and tags that reference unknown styles are kept as is.
-     *
-     * @param array $match
-     *
-     * @return string The replaced style
-     */
-    private function replaceStyle($match)
-    {
-        // we got "\<" escaped char
-        if ('\\' === $match[1]) {
-            return $this->applyCurrentStyle($match[0]);
-        }
-
-        if ('' === $match[3]) {
-            if ('/' === $match[2]) {
-                // we got "</>" tag
-                $this->styleStack->pop();
-
-                return $this->applyCurrentStyle($match[4]);
-            }
-
-            // we got "<>" tag
-            return '<>'.$this->applyCurrentStyle($match[4]);
-        }
-
-        if (isset($this->styles[strtolower($match[3])])) {
-            $style = $this->styles[strtolower($match[3])];
-        } else {
-            $style = $this->createStyleFromString($match[3]);
-
-            if (false === $style) {
-                return $this->applyCurrentStyle($match[0]);
-            }
-        }
-
-        if ('/' === $match[2]) {
-            $this->styleStack->pop($style);
-        } else {
-            $this->styleStack->push($style);
-        }
-
-        return $this->applyCurrentStyle($match[4]);
-    }
-
     /**
      * Tries to create new style instance from string.
      *
@@ -216,6 +198,10 @@ private function replaceStyle($match)
      */
     private function createStyleFromString($string)
     {
+        if (isset($this->styles[$string])) {
+            return $this->styles[$string];
+        }
+
         if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', strtolower($string), $matches, PREG_SET_ORDER)) {
             return false;
         }

Tests/Fixtures/application_renderexception3decorated.txt

@@ -18,7 +18,7 @@
 
                                        
   [Exception]                          
-  First exception <p>this is html</p>  
+  First exception <p>this is html</p>  
                                        
 
 

Tests/Formatter/OutputFormatterTest.php

@@ -73,6 +73,16 @@ public function testNestedStyles()
         );
     }
 
+    public function testAdjacentStyles()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "\033[37;41msome error\033[0m\033[32msome info\033[0m",
+            $formatter->format('<error>some error</error><info>some info</info>')
+        );
+    }
+
     public function testStyleMatchingNotGreedy()
     {
         $formatter = new OutputFormatter(true);
@@ -140,7 +150,15 @@ public function testInlineStyle()
     public function testNonStyleTag()
     {
         $formatter = new OutputFormatter(true);
-        $this->assertEquals("\033[32msome \033[0m\033[32m<tag> styled \033[0m\033[32m<p>single-char tag\033[0m\033[32m</p>\033[0m", $formatter->format('<info>some <tag> styled <p>single-char tag</p></info>'));
+
+        $this->assertEquals("\033[32msome \033[0m\033[32m<tag>\033[0m\033[32m styled \033[0m\033[32m<p>\033[0m\033[32msingle-char tag\033[0m\033[32m</p>\033[0m", $formatter->format('<info>some <tag> styled <p>single-char tag</p></info>'));
+    }
+
+    public function testFormatLongString()
+    {
+        $formatter = new OutputFormatter(true);
+        $long = str_repeat("\\", 14000);
+        $this->assertEquals("\033[37;41msome error\033[0m".$long, $formatter->format('<error>some error</error>'.$long));
     }
 
     public function testNotDecoratedFormatter()