Skip to content

Commit 093e20c

Browse files
committed
Merge branch '3.4'
* 3.4: use the parseFile() method of the YAML parser [Yaml] support parsing files Adding Definition::addError() and a compiler pass to throw errors as exceptions [DI] Add AutowireRequiredMethodsPass to fix bindings for `@required` methods [Cache] Add ResettableInterface to allow resetting any pool's local state [DI][DX] Throw exception on some ContainerBuilder methods used from extensions added missing @author tag for new class allow forms without translations and validator [VarDumper] Make `dump()` a little bit more easier to use [Form] Add ambiguous & exception debug:form tests Reset the authentication token between requests. [Serializer] Getter for extra attributes in ExtraAttributesException [DI] Dont use JSON_BIGINT_AS_STRING # Conflicts: # src/Symfony/Component/Routing/composer.json # src/Symfony/Component/Translation/composer.json # src/Symfony/Component/Yaml/Inline.php # src/Symfony/Component/Yaml/Tests/ParserTest.php # src/Symfony/Component/Yaml/Yaml.php
2 parents a9dbb12 + c5fb3a2 commit 093e20c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Mapping/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function parseNodes(array $nodes)
116116
private function parseFile($path)
117117
{
118118
try {
119-
$classes = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_CONSTANT);
119+
$classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
120120
} catch (ParseException $e) {
121121
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
122122
}

0 commit comments

Comments
 (0)