symfony
diff --git a/‎src/Symfony/Component/Console/Helper/Helper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Helper.php
+6-1Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/Console/Helper/Helper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Helper.php
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Helper/Table.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Table.php
+7-4Lines changed: 7 additions & 4 deletions b/‎src/Symfony/Component/Console/Helper/Table.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/Table.php
+7-4Lines changed: 7 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Helper/TableTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Helper/TableTest.php
+29Lines changed: 29 additions & 0 deletions b/‎src/Symfony/Component/Console/Tests/Helper/TableTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Helper/TableTest.php
+29Lines changed: 29 additions & 0 deletions
@@ -109,6 +109,11 @@ public static function formatMemory($memory)
     }
 
     public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, $string)
+    {
+        return self::strlen(self::removeDecoration($formatter, $string));
+    }
+
+    public static function removeDecoration(OutputFormatterInterface $formatter, $string)
     {
         $isDecorated = $formatter->isDecorated();
         $formatter->setDecorated(false);
@@ -118,6 +123,6 @@ public static function strlenWithoutDecoration(OutputFormatterInterface $formatt
         $string = preg_replace("/\033\[[^m]*m/", '', $string);
         $formatter->setDecorated($isDecorated);
 
-        return self::strlen($string);
+        return $string;
     }
 }
@@ -341,7 +341,7 @@ private function buildTableRows($rows)
                 if (!strstr($cell, "\n")) {
                     continue;
                 }
-                $lines = explode("\n", $cell);
+                $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                 foreach ($lines as $lineKey => $line) {
                     if ($cell instanceof TableCell) {
                         $line = new TableCell($line, array('colspan' => $cell->getColspan()));
@@ -382,7 +382,7 @@ private function fillNextRows($rows, $line)
                 $nbLines = $cell->getRowspan() - 1;
                 $lines = array($cell);
                 if (strstr($cell, "\n")) {
-                    $lines = explode("\n", $cell);
+                    $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                     $nbLines = count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
 
                     $rows[$line][$column] = new TableCell($lines[0], array('colspan' => $cell->getColspan()));
@@ -514,16 +514,19 @@ private function getColumnWidth($column)
             return $this->columnWidths[$column];
         }
 
+        $lengths = array();
+
         foreach (array_merge($this->headers, $this->rows) as $row) {
             if ($row instanceof TableSeparator) {
                 continue;
             }
 
             foreach ($row as $i => $cell) {
                 if ($cell instanceof TableCell) {
-                    $textLength = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
+                    $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
+                    $textLength = Helper::strlen($textContent);
                     if ($textLength > 0) {
-                        $contentColumns = str_split($cell, ceil($textLength / $cell->getColspan()));
+                        $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
                         foreach ($contentColumns as $position => $content) {
                             $row[$i + $position] = $content;
                         }
 
@@ -511,6 +511,35 @@ public function renderProvider()
 | Dante Alighieri | J. R. R. Tolkien | J. R. R |
 +-----------------+------------------+---------+
 
+TABLE
+            ,
+                true,
+            ),
+            'Row with formatted cells containing a newline' => array(
+                array(),
+                array(
+                    array(
+                        new TableCell('<error>Dont break'."\n".'here</error>', array('colspan' => 2)),
+                    ),
+                    new TableSeparator(),
+                    array(
+                        'foo',
+                         new TableCell('<error>Dont break'."\n".'here</error>', array('rowspan' => 2)),
+                    ),
+                    array(
+                        'bar',
+                    ),
+                ),
+                'default',
+                <<<'TABLE'
++-------+------------+
+[39;49m| [39;49m[37;41mDont break[39;49m[39;49m         |[39;49m
+[39;49m| [39;49m[37;41mhere[39;49m               |
++-------+------------+
+[39;49m| foo   | [39;49m[37;41mDont break[39;49m[39;49m |[39;49m
+[39;49m| bar   | [39;49m[37;41mhere[39;49m       |
++-------+------------+
+
 TABLE
             ,
                 true,
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@ public static function formatMemory($memory)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, $string)`
	`112`	`+ {`
	`113`	`+ return self::strlen(self::removeDecoration($formatter, $string));`
	`114`	`+ }`
	`115`	`+`
	`116`	`+ public static function removeDecoration(OutputFormatterInterface $formatter, $string)`
`112`	`117`	`{`
`113`	`118`	`$isDecorated = $formatter->isDecorated();`
`114`	`119`	`$formatter->setDecorated(false);`
`@@ -118,6 +123,6 @@ public static function strlenWithoutDecoration(OutputFormatterInterface $formatt`
`118`	`123`	`$string = preg_replace("/\033\[[^m]*m/", '', $string);`
`119`	`124`	`$formatter->setDecorated($isDecorated);`
`120`	`125`
`121`		`- return self::strlen($string);`
	`126`	`+ return $string;`
`122`	`127`	`}`
`123`	`128`	`}`