Merge branch '2.8' into 3.0

* 2.8:
  update tests to use the new error assertion helper
  [ci] Upgrade to symfony/phpunit-bridge >=3.2@dev

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php

Author: nicolas-grekas

Tests/ParserTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Yaml\Tests;
 
+use Symfony\Bridge\PhpUnit\ErrorAssert;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Parser;
 
@@ -930,11 +931,14 @@ public function testFloatKeys()
      */
     public function testColonInMappingValueException()
     {
-        $yaml = <<<EOF
+        $parser = $this->parser;
+
+        ErrorAssert::assertDeprecationsAreTriggered('Using a colon in the unquoted mapping value "bar: baz" in line 1 is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', function () use ($parser) {
+            $yaml = <<<EOF
 foo: bar: baz
 EOF;
-
-        $this->parser->parse($yaml);
+            $parser->parse($yaml);
+        });
     }
 
     public function testColonInMappingValueExceptionNotTriggeredByColonInComment()