RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71 from fabpot/master

Browse Source 
Updated Symfony2 vendors
This commit is contained in:
Benjamin Eberlei 2011-06-14 08:08:16 -07:00
commit 866534334f
4 changed files with 5 additions and 5 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

@ -506,6 +506,6 @@ class YamlDriver extends AbstractFileDriver
*/
protected function _loadMappingFile($file)
{
return \Symfony\Component\Yaml\Yaml::load($file);
return \Symfony\Component\Yaml\Yaml::parse($file);
}
}

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

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

2
lib/vendor/Symfony/Component/Console vendored

@ -1 +1 @@
Subproject commit 4200b4bc95ae3c1b03d943cd875277e35a17898a
Subproject commit 3762cec59aaecf1e55ed92b2b0b3e7f2d602d09a

2
lib/vendor/Symfony/Component/Yaml vendored

@ -1 +1 @@
Subproject commit 3d864452ca73ae5409f1434b65f0c7204a50e061
Subproject commit c3e1d03effe339de6940f69a4d0278ea34665702