nicolas-grekas
diff --git a/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 16 additions & 17 deletions b/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 16 additions & 17 deletions
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 13 additions & 11 deletions b/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 13 additions & 11 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/InlineTest.php
Lines changed: 2 additions & 32 deletions b/‎src/Symfony/Component/Yaml/Tests/InlineTest.php
Lines changed: 2 additions & 32 deletions
@@ -25,6 +25,7 @@ class Inline
 
     private static $exceptionOnInvalidType = false;
     private static $objectSupport = false;
+    private static $objectForMap = false;
 
     /**
      * Converts a YAML string to a PHP array.
@@ -34,14 +35,15 @@ class Inline
      * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      * @param Boolean $objectForMap           true if maps should return a stdClass instead of array()
      *
-     * @throws Exception\ParseException
      * @return array A PHP array representing the YAML string
      *
+     * @throws ParseException
      */
     public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
     {
         self::$exceptionOnInvalidType = $exceptionOnInvalidType;
         self::$objectSupport = $objectSupport;
+        self::$objectForMap = $objectForMap;
 
         $value = trim($value);
 
@@ -57,11 +59,11 @@ public static function parse($value, $exceptionOnInvalidType = false, $objectSup
         $i = 0;
         switch ($value[0]) {
             case '[':
-                $result = self::parseSequence($value, $i, $objectForMap);
+                $result = self::parseSequence($value, $i);
                 ++$i;
                 break;
             case '{':
-                $result = self::parseMapping($value, $i, $objectForMap);
+                $result = self::parseMapping($value, $i);
                 ++$i;
                 break;
             default:
@@ -264,12 +266,12 @@ private static function parseQuotedScalar($scalar, &$i)
      *
      * @param string  $sequence
      * @param integer &$i
-     * @param Boolean $objectForMap true if maps should return a stdClass instead of array()
      *
-     * @throws Exception\ParseException
      * @return string A YAML string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
      */
-    private static function parseSequence($sequence, &$i = 0, $objectForMap = false)
+    private static function parseSequence($sequence, &$i = 0)
     {
         $output = array();
         $len = strlen($sequence);
@@ -280,11 +282,11 @@ private static function parseSequence($sequence, &$i = 0, $objectForMap = false)
             switch ($sequence[$i]) {
                 case '[':
                     // nested sequence
-                    $output[] = self::parseSequence($sequence, $i, $objectForMap);
+                    $output[] = self::parseSequence($sequence, $i);
                     break;
                 case '{':
                     // nested mapping
-                    $output[] = self::parseMapping($sequence, $i, $objectForMap);
+                    $output[] = self::parseMapping($sequence, $i);
                     break;
                 case ']':
                     return $output;
@@ -298,8 +300,7 @@ private static function parseSequence($sequence, &$i = 0, $objectForMap = false)
                     if (!$isQuoted && false !== strpos($value, ': ')) {
                         // embedded mapping?
                         try {
-                            $j = 0;
-                            $value = self::parseMapping('{'.$value.'}', $j, $objectForMap);
+                            $value = self::parseMapping('{'.$value.'}');
                         } catch (\InvalidArgumentException $e) {
                             // no, it's not
                         }
@@ -321,13 +322,12 @@ private static function parseSequence($sequence, &$i = 0, $objectForMap = false)
      *
      * @param string  $mapping
      * @param integer &$i
-     * @param Boolean $objectForMap    true if maps should return a stdClass instead of array()
      *
-     * @throws Exception\ParseException
      * @return string A YAML string
      *
+     * @throws ParseException When malformed inline YAML string is parsed
      */
-    private static function parseMapping($mapping, &$i = 0, $objectForMap = false)
+    private static function parseMapping($mapping, &$i = 0)
     {
         $output = array();
         $len = strlen($mapping);
@@ -341,7 +341,7 @@ private static function parseMapping($mapping, &$i = 0, $objectForMap = false)
                     ++$i;
                     continue 2;
                 case '}':
-                    if (true === $objectForMap) {
+                    if (self::$objectForMap) {
                         return (object) $output;
                     }
 
@@ -354,17 +354,16 @@ private static function parseMapping($mapping, &$i = 0, $objectForMap = false)
             // value
             $done = false;
 
-
             while ($i < $len) {
                 switch ($mapping[$i]) {
                     case '[':
                         // nested sequence
-                        $output[$key] = self::parseSequence($mapping, $i, $objectForMap);
+                        $output[$key] = self::parseSequence($mapping, $i);
                         $done = true;
                         break;
                     case '{':
                         // nested mapping
-                        $output[$key] = self::parseMapping($mapping, $i, $objectForMap);
+                        $output[$key] = self::parseMapping($mapping, $i);
                         $done = true;
                         break;
                     case ':':
 
@@ -44,12 +44,13 @@ public function __construct($offset = 0)
      * @param string  $value                  A YAML string
      * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
      * @param Boolean $objectSupport          true if object support is enabled, false otherwise
+     * @param Boolean $objectForMap           true if maps should return a stdClass instead of array()
      *
      * @return mixed  A PHP value
      *
      * @throws ParseException If the YAML is not valid
      */
-    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false)
+    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
     {
         $this->currentLineNb = -1;
         $this->currentLine = '';
@@ -93,7 +94,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                     $c = $this->getRealCurrentLineNb() + 1;
                     $parser = new Parser($c);
                     $parser->refs =& $this->refs;
-                    $data[] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
+                    $data[] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
                 } else {
                     if (isset($values['leadspaces'])
                         && ' ' == $values['leadspaces']
@@ -109,9 +110,9 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                             $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
                         }
 
-                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport);
+                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport, $objectForMap);
                     } else {
-                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport);
+                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
                     }
                 }
             } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && false === strpos($values['key'],' #')) {
@@ -121,7 +122,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                 $context = 'mapping';
 
                 // force correct settings
-                Inline::parse(null, $exceptionOnInvalidType, $objectSupport);
+                Inline::parse(null, $exceptionOnInvalidType, $objectSupport, $objectForMap);
                 try {
                     $key = Inline::parseScalar($values['key']);
                 } catch (ParseException $e) {
@@ -146,7 +147,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new Parser($c);
                         $parser->refs =& $this->refs;
-                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);
+                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
 
                         $merged = array();
                         if (!is_array($parsed)) {
@@ -183,21 +184,21 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new Parser($c);
                         $parser->refs =& $this->refs;
-                        $data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
+                        $data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
                     }
                 } else {
                     if ($isInPlace) {
                         $data = $this->refs[$isInPlace];
                     } else {
-                        $data[$key] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport);
+                        $data[$key] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
                     }
                 }
             } else {
                 // 1-liner optionally followed by newline
                 $lineCount = count($this->lines);
                 if (1 === $lineCount || (2 === $lineCount && empty($this->lines[1]))) {
                     try {
-                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport);
+                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport, $objectForMap);
                     } catch (ParseException $e) {
                         $e->setParsedLine($this->getRealCurrentLineNb() + 1);
                         $e->setSnippet($this->currentLine);
@@ -376,12 +377,13 @@ private function moveToPreviousLine()
      * @param string  $value                  A YAML value
      * @param Boolean $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
      * @param Boolean $objectSupport          True if object support is enabled, false otherwise
+     * @param Boolean $objectForMap           true if maps should return a stdClass instead of array()
      *
      * @return mixed  A PHP value
      *
      * @throws ParseException When reference does not exist
      */
-    private function parseValue($value, $exceptionOnInvalidType, $objectSupport)
+    private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap)
     {
         if (0 === strpos($value, '*')) {
             if (false !== $pos = strpos($value, '#')) {
@@ -404,7 +406,7 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport)
         }
 
         try 
1241
{
-            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport);
+            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
         } catch (ParseException $e) {
             $e->setParsedLine($this->getRealCurrentLineNb() + 1);
             $e->setSnippet($this->currentLine);
 
@@ -26,15 +26,8 @@ public function testParseWithMapObjects()
     {
         foreach ($this->getTestsForMapObjectParse() as $yaml => $value) {
             $actual = Inline::parse($yaml, false, false, true);
-            if (true === is_object($value)) {
-                $this->assertInstanceOf(get_class($value), $actual);
-                $this->assertEquals(get_object_vars($value), get_object_vars($actual));
-            } elseif (true === is_array($value)) {
-                $this->assertEquals($value, $actual);
-                $this->assertMixedArraysSame($value, $actual);
-            } else {
-                $this->assertSame($value, $actual);
-            }
+
+            $this->assertSame(serialize($value), serialize($actual));
         }
 
     }
@@ -324,27 +317,4 @@ protected function getTestsForDump()
             '[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']' => array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%',), true, '@service_container',),
         );
     }
-
-    protected function assertMixedArraysSame($a, $b)
-    {
-
-        foreach ($a as $key => $value) {
-            if (array_key_exists($key, $b)) {
-                if (is_array($value)) {
-                    $this->assertMixedArraysSame($value, $b[$key]);
-                } else {
-                    if (true === is_object($value)) {
-                        $this->assertEquals($value, $b[$key]);
-                        $this->assertInstanceOf(get_class($value), $b[$key]);
-                        $this->assertEquals(get_object_vars($value), get_object_vars($b[$key]));
-                    } else {
-                        $this->assertSame($value, $b[$key]);
-                    }
-                }
-            } else {
-                $this->assertFail();
-            }
-        }
-
-    }
 }