Skip to content

Commit 33fd1b2

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Console] Add missing `@require` annotation in test Fix merge [appveyor] Fix failure reporting [#17634] move DebugBundle license file backport GlobTest from 2.7 branch Move licenses according to new best practices [FrameworkBundle] Remove unused code in test [2.3] Fixed an undefined variable in Glob::toRegex simplified a test fix container cache key generation [Form] fix option name in changelog [Translation] Add resources from fallback locale [DependencyInjection] enforce tags to have a name [YAML] Refine the return value of Yaml::parse() Conflicts: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
2 parents ccbaef9 + 5552043 commit 33fd1b2

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Yaml.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
class Yaml
2222
{
2323
/**
24-
* Parses YAML into a PHP array.
25-
*
26-
* The parse method, when supplied with a YAML stream (string or file),
27-
* will do its best to convert YAML in a file into a PHP array.
24+
* Parses YAML into a PHP value.
2825
*
2926
* Usage:
3027
* <code>
@@ -43,7 +40,7 @@ class Yaml
4340
* @param bool $objectSupport True if object support is enabled, false otherwise
4441
* @param bool $objectForMap True if maps should return a stdClass instead of array()
4542
*
46-
* @return array The YAML converted to a PHP array
43+
* @return mixed The YAML converted to a PHP value
4744
*
4845
* @throws ParseException If the YAML is not valid
4946
*/

0 commit comments

Comments
 (0)