RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 14:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:doctrine/doctrine2

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-06-15 18:29:01 +02:00
commit 71082bdba8
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doctrine-mapping.xsd
View File

@ -212,7 +212,7 @@
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
</xs:sequence>
<xs:attribute name="name" type="xs:NMTOKEN" use="optional"/>
<xs:attribute name="columns" type="xs:NMTOKENS" use="required"/>
<xs:attribute name="columns" type="xs:string" use="required"/>
<xs:anyAttribute namespace="##other"/>
</xs:complexType>

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