[Yaml] parse PHP constants in mapping keys

xabbuh · xabbuh · commit 5ea41c1ca015 · 2017-05-23T23:16:45.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -208,7 +208,7 @@ private function doParse($value, $flags)
                     $this->refs[$isRef] = end($data);
                 }
             } elseif (
-                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|(?:![^\s]++\s++)?[^ \'"\[\{!].*?) *\:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
+                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|(?:!?!php/const:)?(?:![^\s]++\s++)?[^ \'"\[\{!].*?) *\:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
                 && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))
             ) {
                 if ($context && 'sequence' == $context) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1773,9 +1773,36 @@ public function testParserCleansUpReferencesBetweenRuns()
 YAML;
         $this->parser->parse($yaml);
     }
+
+    public function testPhpConstantTagMappingKey()
+    {
+        $yaml = <<<YAML
+transitions:
+    !php/const:Symfony\Component\Yaml\Tests\B::FOO:
+        from:
+            - !php/const:Symfony\Component\Yaml\Tests\B::BAR
+        to: !php/const:Symfony\Component\Yaml\Tests\B::BAZ
+YAML;
+        $expected = array(
+            'transitions' => array(
+                'foo' => array(
+                    'from' => array(
+                        'bar',
+                    ),
+                    'to' => 'baz',
+                ),
+            ),
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT));
+    }
 }
 
 class B
 {
     public $b = 'foo';
+
+    const FOO = 'foo';
+    const BAR = 'bar';
+    const BAZ = 'baz';
 }

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private function doParse($value, $flags)`
`208`	`208`	`$this->refs[$isRef] = end($data);`
`209`	`209`	`}`
`210`	`210`	`} elseif (`
`211`		`- self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|(?:![^\s]++\s++)?[^ \'"\[\{!].?) \:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
	`211`	`+ self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|(?:!?!php/const:)?(?:![^\s]++\s++)?[^ \'"\[\{!].?) \:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
`212`	`212`	`&& (false === strpos($values['key'], ' #') \|\| in_array($values['key'][0], array('"', "'")))`
`213`	`213`	`) {`
`214`	`214`	`if ($context && 'sequence' == $context) {`