Fix bad merge

Author: nicolas-grekas

Tests/InlineTest.php

@@ -277,39 +277,24 @@ public function testParseUnquotedAsteriskFollowedByAComment()
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
      */
-    public function testParseUnquotedScalarStartingWithReservedAtIndicator()
+    public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
     {
-        Inline::parse('{ foo: @foo }');
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Not quoting the scalar "`foo " starting with "`" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.
-     * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
-     */
-    public function testParseUnquotedScalarStartingWithReservedBacktickIndicator()
-    {
-        Inline::parse('{ foo: `foo }');
-    }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation Not quoting the scalar "|foo " starting with "|" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.
-     * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
-     */
-    public function testParseUnquotedScalarStartingWithLiteralStyleIndicator()
+    public function getReservedIndicators()
     {
-        Inline::parse('{ foo: |foo }');
+        return array(array('@'), array('`'));
     }
 
     /**
      * @dataProvider getScalarIndicators
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
      */
-    public function testParseUnquotedScalarStartingWithFoldedStyleIndicator()
+    public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
     {
-        Inline::parse('{ foo: >foo }');
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
     }
 
     public function getScalarIndicators()