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

Merge pull request #6478 from lcobucci/fix-yaml-tests

Browse Source 
Fix YAML related tests
This commit is contained in:
Marco Pivetta 2017-05-30 14:05:19 +02:00 committed by GitHub
commit 205ee72e33
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -800,6 +800,10 @@ class YamlDriver extends FileDriver
*/ */
protected function loadMappingFile($file) protected function loadMappingFile($file)
{ {
if (defined(Yaml::class . '::PARSE_KEYS_AS_STRINGS')) {
return Yaml::parse(file_get_contents($file), Yaml::PARSE_KEYS_AS_STRINGS);
}
return Yaml::parse(file_get_contents($file)); return Yaml::parse(file_get_contents($file));
} }
} }

3
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml
View File

@ -135,7 +135,6 @@ Doctrine\Tests\Models\CMS\CmsUser:
name: address_id name: address_id
referencedColumnName: id referencedColumnName: id
cascade: [ persist ] cascade: [ persist ]
oneToOne:
email: email:
targetEntity: CmsEmail targetEntity: CmsEmail
orphanRemoval: true orphanRemoval: true
@ -155,4 +154,4 @@ Doctrine\Tests\Models\CMS\CmsUser:
inverseJoinColumns: inverseJoinColumns:
group_id: group_id:
referencedColumnName: id referencedColumnName: id
cascade: [ persist , detach, merge] cascade: [ persist , detach, merge]

3
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml
View File

@ -52,7 +52,6 @@ Doctrine\Tests\Models\Company\CompanyPerson:
name: address_id name: address_id
referencedColumnName: id referencedColumnName: id
cascade: [ persist ] cascade: [ persist ]
oneToOne:
email: email:
targetEntity: CmsEmail targetEntity: CmsEmail
orphanRemoval: true orphanRemoval: true
@ -72,4 +71,4 @@ Doctrine\Tests\Models\Company\CompanyPerson:
inverseJoinColumns: inverseJoinColumns:
group_id: group_id:
referencedColumnName: id referencedColumnName: id
cascade: [ persist , detach, merge] cascade: [ persist , detach, merge]