Merge branch '2.7' into 2.8

* 2.7:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php

@@ -150,7 +150,7 @@ public function getUndefinedControllers()
     {
         return array(
             array('foo', '\LogicException', 'Unable to parse the controller name "foo".'),
-            array('foo::bar', '\InvalidArgumentException', 'Class "foo" does not exist.'),
+            array('oof::bar', '\InvalidArgumentException', 'Class "oof" does not exist.'),
             array('stdClass', '\LogicException', 'Unable to parse the controller name "stdClass".'),
             array(
                 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',

src/Symfony/Component/BrowserKit/composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0"
+        "symfony/dom-crawler": "~2.1|~3.0.0"
     },
     "require-dev": {
         "symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0",

src/Symfony/Component/Console/Helper/Table.php

@@ -307,7 +307,7 @@ private function renderRowSeparator()
      */
     private function renderColumnSeparator()
     {
-        $this->output->write(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
+        return sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar());
     }
 
     /**
@@ -324,12 +324,12 @@ private function renderRow(array $row, $cellFormat)
             return;
         }
 
-        $this->renderColumnSeparator();
+        $rowContent = $this->renderColumnSeparator();
         foreach ($this->getRowColumns($row) as $column) {
-            $this->renderCell($row, $column, $cellFormat);
-            $this->renderColumnSeparator();
+            $rowContent .= $this->renderCell($row, $column, $cellFormat);
+            $rowContent .= $this->renderColumnSeparator();
         }
-        $this->output->writeln('');
+        $this->output->writeln($rowContent);
     }
 
     /**
@@ -358,12 +358,13 @@ private function renderCell(array $row, $column, $cellFormat)
         $style = $this->getColumnStyle($column);
 
         if ($cell instanceof TableSeparator) {
-            $this->output->write(sprintf($style->getBorderFormat(), str_repeat($style->getHorizontalBorderChar(), $width)));
-        } else {
-            $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
-            $content = sprintf($style->getCellRowContentFormat(), $cell);
-            $this->output->write(sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType())));
+            return sprintf($style->getBorderFormat(), str_repeat($style->getHorizontalBorderChar(), $width));
         }
+
+        $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
+        $content = sprintf($style->getCellRowContentFormat(), $cell);
+
+        return sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType()));
     }
 
     /**

src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

@@ -499,7 +499,7 @@ public function testHandleErrorException()
         $handler->handleException($exception);
 
         $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $args[0]);
-        $this->assertSame("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement?", $args[0]->getMessage());
+        $this->assertStringStartsWith("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage());
     }
 
     public function testHandleFatalErrorOnHHVM()

src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php

@@ -127,7 +127,7 @@ public function getUndefinedControllers()
     {
         return array(
             array('foo'),
-            array('foo::bar'),
+            array('oof::bar'),
             array('stdClass'),
             array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar'),
         );