minor #14412 [Yaml] Match signature of Yaml::parse() with Parser->parse() (Zzortell)

fabpot · fabpot · commit 3a404f8fe610 · 2015-04-27T14:33:52.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Yaml] Match signature of Yaml::parse() with Parser->parse() | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 238589d Add $objectForMap as argument of Yaml::parse()
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -41,6 +41,7 @@ class Yaml
      * @param string $input                  Path to a YAML file or a string containing YAML
      * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
      * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
      *
      * @return array The YAML converted to a PHP array
      *
@@ -50,7 +51,7 @@ class Yaml
      *
      * @api
      */
-    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false)
+    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
     {
         // if input is a file, process it
         $file = '';
@@ -68,7 +69,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
         $yaml = new Parser();
 
         try {
-            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport);
+            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);
         } catch (ParseException $e) {
             if ($file) {
                 $e->setParsedFile($file);

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ class Yaml`
`41`	`41`	`* @param string $input Path to a YAML file or a string containing YAML`
`42`	`42`	`* @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise`
`43`	`43`	`* @param bool $objectSupport True if object support is enabled, false otherwise`
	`44`	`+ * @param bool $objectForMap True if maps should return a stdClass instead of array()`
`44`	`45`	`*`
`45`	`46`	`* @return array The YAML converted to a PHP array`
`46`	`47`	`*`
`@@ -50,7 +51,7 @@ class Yaml`
`50`	`51`	`*`
`51`	`52`	`* @api`
`52`	`53`	`*/`
`53`		`- public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false)`
	`54`	`+ public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)`
`54`	`55`	`{`
`55`	`56`	`// if input is a file, process it`
`56`	`57`	`$file = '';`
`@@ -68,7 +69,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup`
`68`	`69`	`$yaml = new Parser();`
`69`	`70`
`70`	`71`	`try {`
`71`		`- return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport);`
	`72`	`+ return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);`
`72`	`73`	`} catch (ParseException $e) {`
`73`	`74`	`if ($file) {`
`74`	`75`	`$e->setParsedFile($file);`