From a7effb888b8c1abb0bc789be01a10a2f327b6ee4 Mon Sep 17 00:00:00 2001 From: Zac Sturgess Date: Thu, 17 Dec 2015 16:36:44 +0000 Subject: [PATCH] Fix #6037 --- components/yaml/introduction.rst | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/components/yaml/introduction.rst b/components/yaml/introduction.rst index adb0d0956e6..c4104e01e40 100644 --- a/components/yaml/introduction.rst +++ b/components/yaml/introduction.rst @@ -135,16 +135,9 @@ It may also be convenient to use the $yaml = Yaml::parse(file_get_contents('/path/to/file.yml')); -The :method:`Symfony\\Component\\Yaml\\Yaml::parse` static method takes a YAML -string or a file containing YAML. Internally, it calls the -:method:`Symfony\\Component\\Yaml\\Parser::parse` method, but enhances the -error if something goes wrong by adding the filename to the message. - -.. caution:: - - Because it is currently possible to pass a filename to this method, you - must validate the input first. Passing a filename is deprecated in - Symfony 2.2, and will be removed in Symfony 3.0. +The :method:`Symfony\\Component\\Yaml\\Yaml::parse` static method takes a YAML string. +Internally, it constructs a :class:`Symfony\\Component\\Yaml\\Parser` object and calls +the :method:`Symfony\\Component\\Yaml\\Parser::parse` method. .. _components-yaml-dump: