From 22a1105f42d07dd4525352054b37667737fed46d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Jun 2016 10:33:40 +0200
Subject: [PATCH] Fix merge

---
 src/Symfony/Component/Yaml/Tests/ParserTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index cb6bc4b234..ba8ddb1c68 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Yaml\Tests;
 
-use Symfony\Bridge\PhpUnit\ErrorAssert;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Parser;
 
@@ -931,13 +930,11 @@ EOF;
      */
     public function testColonInMappingValueException()
     {
-        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
+        $yaml = <<<EOF
 foo: bar: baz
 EOF;
 
-            $this->parser->parse($yaml);
-        });
+        $this->parser->parse($yaml);
     }
 
     public function testColonInMappingValueExceptionNotTriggeredByColonInComment()