Merge branch '3.0' into 3.1

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

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;
 
@@ -967,11 +968,13 @@ public function testFloatKeys()
      */
     public function testColonInMappingValueException()
     {
-        $yaml = <<<EOF
+        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 () {
+            $yaml = <<<EOF
 foo: bar: baz
 EOF;
 
-        $this->parser->parse($yaml);
+            $this->parser->parse($yaml);
+        });
     }
 
     public function testColonInMappingValueExceptionNotTriggeredByColonInComment()