minor #22105 [Yaml] Fix error handling on ini file parsing (chalasr)

xabbuh · xabbuh · commit daac6c24490c · 2017-03-22T12:03:03.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Yaml] Fix error handling on ini file parsing | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Should make travis green again on master. /cc @xabbuh Commits ------- 71cec82 [Yaml] Fix error handling in parser
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -341,7 +341,7 @@ public function parse($value, $flags = 0)
                         try {
                             $parsedLine = Inline::parse($line, $flags, $this->refs);
 
-                            if (!is_string($value)) {
+                            if (!is_string($parsedLine)) {
                                 $parseError = true;
                                 break;
                             }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1687,6 +1687,21 @@ public function testComplexMappingNestedInSequenceThrowsParseException()
         $this->parser->parse($yaml);
     }
 
+    /**
+     * @expectedException        \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage Unable to parse at line 1 (near "[parameters]").
+     */
+    public function testParsingIniThrowsException()
+    {
+        $ini = <<<INI
+[parameters]
+  foo = bar
+  bar = %foo%
+INI;
+
+        $this->parser->parse($ini);
+    }
+
     private function loadTestsFromFixtureFiles($testsFile)
     {
         $parser = new Parser();

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ public function parse($value, $flags = 0)`
`341`	`341`	`try {`
`342`	`342`	`$parsedLine = Inline::parse($line, $flags, $this->refs);`
`343`	`343`
`344`		`- if (!is_string($value)) {`
	`344`	`+ if (!is_string($parsedLine)) {`
`345`	`345`	`$parseError = true;`
`346`	`346`	`break;`
`347`	`347`	`}`