RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

#1200 - removing Yaml::parse() deprecation errors by passing in file contents instead of file paths

Browse Source
This commit is contained in:
Marco Pivetta 2014-12-04 13:37:59 +01:00
parent 30bf192cf4
commit d3b1bf571b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -788,6 +788,6 @@ class YamlDriver extends FileDriver
*/
protected function loadMappingFile($file)
{
return Yaml::parse($file);
return Yaml::parse(file_get_contents($file));
}
}

4
lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
View File

@ -77,10 +77,10 @@ class ConvertDoctrine1Schema
if (is_dir($path)) {
$files = glob($path . '/*.yml');
foreach ($files as $file) {
$schema = array_merge($schema, (array) Yaml::parse($file));
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
}
} else {
$schema = array_merge($schema, (array) Yaml::parse($path));
$schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file)));
}
}