May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016
diff --git a/components/yaml/introduction.rst b/components/yaml/introduction.rst

 .. _components-yaml-dump:

 Objects for Mappings
 ....................

 .. versionadded:: 2.7
    Support for parsing mappings as objects was introduced in Symfony 2.6.

 Yaml :ref:`mappings <yaml-format-collections>` are basically associative
 arrays. You can instruct the parser to return mappings as objects (i.e.
 ``\stdClass`` instances) by setting the fourth argument to ``true``::

    $object = Yaml::parse('{"foo": "bar"}', false, false, true);
    echo get_class($object); // stdClass
    echo $object->foo; // bar

 Writing YAML Files
 ~~~~~~~~~~~~~~~~~~

diff --git a/components/yaml/yaml_format.rst b/components/yaml/yaml_format.rst
    # simple date
    2002-12-14

 .. _yaml-format-collections:

 Collections
 -----------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,6 +148,20 @@ error if something goes wrong by adding the filename to the message.

		.. _components-yaml-dump:

		Objects for Mappings
		....................

		.. versionadded:: 2.7
Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 2.5? Copy link ContributorAuthor dantleechMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 2.6 :) HeahDude reacted with laugh emoji Copy link ContributorAuthor dantleechMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. So it was added to`Parser#parse` in`2.6` but to`Yaml::parse` in 2.7. Kept the note at 2.7 as I guess`Yaml` is the main entry point. xabbuh reacted with thumbs up emoji Copy link Member xabbuhMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ah indeed, this was a bit inconsistent. But as we should prefer the static API 2.7 is a good choice here.
		Support for parsing mappings as objects was introduced in Symfony 2.6.
Copy link Member xabbuhMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It was added in 2.7. Copy link ContributorAuthor dantleechMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Hmm, it was added to`Parser` in 2.6 and and`Yaml::parse` in 2.7 :/ Copy link Member xabbuhMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think we should prefer the static API (see#6598) so using 2.7 here is the best idea imo.

		Yaml :ref:`mappings <yaml-format-collections>` are basically associative
		arrays. You can instruct the parser to return mappings as objects (i.e.
		``\stdClass`` instances) by setting the fourth argument to ``true``::

		$object = Yaml::parse('{"foo": "bar"}', false, false, true);
		echo get_class($object); // stdClass
		echo $object->foo; // bar

		Writing YAML Files
		~~~~~~~~~~~~~~~~~~

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -165,6 +165,8 @@ YAML uses the ISO-8601 standard to express dates:
		# simple date
		2002-12-14

		.. _yaml-format-collections:

		Collections
		-----------

Expand Down