Fix issue 40507: Tabs as separators between tokens

bertramakers · xabbuh · commit 9a130ae93e5b · 2021-04-23T09:44:00.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -200,7 +200,7 @@ private function doParse(string $value, int $flags)
                     array_pop($this->refsBeingParsed);
                 }
             } elseif (
-                self::preg_match('#^(?P<key>(?:![^\s]++\s++)?(?:'.Inline::REGEX_QUOTED_STRING.'|(?:!?!php/const:)?[^ \'"\[\{!].*?)) *\:( ++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
+                self::preg_match('#^(?P<key>(?:![^\s]++\s++)?(?:'.Inline::REGEX_QUOTED_STRING.'|(?:!?!php/const:)?[^ \'"\[\{!].*?)) *\:(( |\t)++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
                 && (false === strpos($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"]))
             ) {
                 if ($context && 'sequence' == $context) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -52,26 +52,67 @@ public function getNonStringMappingKeysData()
         return $this->loadTestsFromFixtureFiles('nonStringKeys.yml');
     }
 
-    public function testTabsInYaml()
+    /**
+     * @dataProvider invalidIndentation
+     */
+    public function testTabsAsIndentationInYaml(string $given, string $expectedMessage)
     {
-        // test tabs in YAML
-        $yamls = [
-            "foo:\n	bar",
-            "foo:\n 	bar",
-            "foo:\n	 bar",
-            "foo:\n 	 bar",
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage($expectedMessage);
+        $this->parser->parse($given);
+    }
+
+    public function invalidIndentation(): array
+    {
+        return [
+            [
+                "foo:\n\tbar",
+                "A YAML file cannot contain tabs as indentation at line 2 (near \"\tbar\").",
+            ],
+            [
+                "foo:\n \tbar",
+                "A YAML file cannot contain tabs as indentation at line 2 (near \"\tbar\").",
+            ],
+            [
+                "foo:\n\t bar",
+                "A YAML file cannot contain tabs as indentation at line 2 (near \"\t bar\").",
+            ],
+            [
+                "foo:\n \t bar",
+                "A YAML file cannot contain tabs as indentation at line 2 (near \"\t bar\").",
+            ],
         ];
+    }
 
-        foreach ($yamls as $yaml) {
-            try {
-                $this->parser->parse($yaml);
+    /**
+     * @dataProvider validTokenSeparators
+     */
+    public function testValidTokenSeparation(string $given, array $expected)
+    {
+        $actual = $this->parser->parse($given);
+        $this->assertEquals($expected, $actual);
+    }
 
-                $this->fail('YAML files must not contain tabs');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf(\Exception::class, $e, 'YAML files must not contain tabs');
-                $this->assertEquals('A YAML file cannot contain tabs as indentation at line 2 (near "'.strpbrk($yaml, "\t").'").', $e->getMessage(), 'YAML files must not contain tabs');
-            }
-        }
+    public function validTokenSeparators(): array
+    {
+        return [
+            [
+                'foo: bar',
+                ['foo' => 'bar'],
+            ],
+            [
+                "foo:\tbar",
+                ['foo' => 'bar'],
+            ],
+            [
+                "foo: \tbar",
+                ['foo' => 'bar'],
+            ],
+            [
+                "foo:\t bar",
+                ['foo' => 'bar'],
+            ],
+        ];
     }
 
     public function testEndOfTheDocumentMarker()

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ private function doParse(string $value, int $flags)`
`200`	`200`	`array_pop($this->refsBeingParsed);`
`201`	`201`	`}`
`202`	`202`	`} elseif (`
`203`		`- self::preg_match('#^(?P<key>(?:![^\s]++\s++)?(?:'.Inline::REGEX_QUOTED_STRING.'\|(?:!?!php/const:)?[^ \'"\[\{!].?)) \:( ++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
	`203`	`+ self::preg_match('#^(?P<key>(?:![^\s]++\s++)?(?:'.Inline::REGEX_QUOTED_STRING.'\|(?:!?!php/const:)?[^ \'"\[\{!].?)) \:(( \|\t)++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
`204`	`204`	`&& (false === strpos($values['key'], ' #') \|\| \in_array($values['key'][0], ['"', "'"]))`
`205`	`205`	`) {`
`206`	`206`	`if ($context && 'sequence' == $context) {`