Merge branch '6.1' into 6.2

* 6.1:
  parse unquoted digits in tag values as integers
  do not wire the MercureTransportFactory if the MercureBundle is not enabled
  skip tests if the signal to be sent is not available
  skip a test if the signal to be sent is not available

Author: derrabus

Inline.php

@@ -77,7 +77,7 @@ public static function parse(string $value = null, int $flags = 0, array &$refer
                 ++$i;
                 break;
             default:
-                $result = self::parseScalar($value, $flags, null, $i, null === $tag, $references);
+                $result = self::parseScalar($value, $flags, null, $i, true, $references);
         }
 
         // some comments are allowed at the end
@@ -677,7 +677,6 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
                 }
 
                 return octdec($value);
-            // Optimize for returning strings.
             case \in_array($scalar[0], ['+', '-', '.'], true) || is_numeric($scalar[0]):
                 if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) {
                     $scalar = str_replace('_', '', $scalar);

Tests/DumperTest.php

@@ -473,8 +473,6 @@ public function testDumpingTaggedValueSequenceWithInlinedTagValues()
 
 YAML;
         $this->assertSame($expected, $yaml);
-        // @todo Fix the parser, preserve numbers.
-        $data[2] = new TaggedValue('number', '5');
         $this->assertSameData($data, $this->parser->parse($expected, Yaml::PARSE_CUSTOM_TAGS));
     }
 
@@ -503,8 +501,6 @@ public function testDumpingTaggedValueMapRespectsInlineLevel()
 
 YAML;
         $this->assertSame($expected, $yaml);
-        // @todo Fix the parser, preserve numbers.
-        $data['count'] = new TaggedValue('number', '5');
         $this->assertSameData($data, $this->parser->parse($expected, Yaml::PARSE_CUSTOM_TAGS));
     }
 
@@ -558,9 +554,6 @@ public function testDumpingNotInlinedNullTaggedValue()
 YAML;
 
         $this->assertSame($expected, $this->dumper->dump($data, 2));
-
-        // @todo Fix the parser, don't stringify null.
-        $data['foo'] = new TaggedValue('bar', 'null');
         $this->assertSameData($data, $this->parser->parse($expected, Yaml::PARSE_CUSTOM_TAGS | Yaml::PARSE_CONSTANT));
     }
 

Tests/Fixtures/YtsSpecificationExamples.yml

@@ -913,7 +913,7 @@ yaml: |
    no int: ! 12
    string: !!str 12
 php: |
-   [ 'integer' => 12, 'no int' => '12', 'string' => '12' ]
+   [ 'integer' => 12, 'no int' => 12, 'string' => '12' ]
 ---
 test: Private types
 todo: true

Tests/InlineTest.php

@@ -784,6 +784,24 @@ public function testTagWithEmptyValueInMapping()
         $this->assertSame('', $value['foo']->getValue());
     }
 
+    public function testTagWithQuotedInteger()
+    {
+        $value = Inline::parse('!number "5"', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value);
+        $this->assertSame('number', $value->getTag());
+        $this->assertSame('5', $value->getValue());
+    }
+
+    public function testTagWithUnquotedInteger()
+    {
+        $value = Inline::parse('!number 5', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value);
+        $this->assertSame('number', $value->getTag());
+        $this->assertSame(5, $value->getValue());
+    }
+
     public function testUnfinishedInlineMap()
     {
         $this->expectException(ParseException::class);

Tests/ParserTest.php

@@ -56,18 +56,16 @@ public function testTaggedValueTopLevelNumber()
     {
         $yml = '!number 5';
         $data = $this->parser->parse($yml, Yaml::PARSE_CUSTOM_TAGS);
-        // @todo Preserve the number, don't turn into string.
-        $expected = new TaggedValue('number', '5');
+        $expected = new TaggedValue('number', 5);
         $this->assertSameData($expected, $data);
     }
 
     public function testTaggedValueTopLevelNull()
     {
         $yml = '!tag null';
         $data = $this->parser->parse($yml, Yaml::PARSE_CUSTOM_TAGS);
-        // @todo Preserve literal null, don't turn into string.
-        $expected = new TaggedValue('tag', 'null');
-        $this->assertSameData($expected, $data);
+
+        $this->assertSameData(new TaggedValue('tag', null), $data);
     }
 
     public function testTaggedValueTopLevelString()
@@ -1557,9 +1555,6 @@ public function testParseDateAsMappingValue()
     }
 
     /**
-     * @param $lineNumber
-     * @param $yaml
-     *
      * @dataProvider parserThrowsExceptionWithCorrectLineNumberProvider
      */
     public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)
@@ -2313,7 +2308,7 @@ public function taggedValuesProvider()
 
     public function testNonSpecificTagSupport()
     {
-        $this->assertSame('12', $this->parser->parse('! 12'));
+        $this->assertSame(12, $this->parser->parse('! 12'));
     }
 
     public function testCustomTagsDisabled()