RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 08:49:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6630 from doctrine/fix/remove-reliance-on-yaml-deprecated-constants

Browse Source 
Remove reliance on Symfony\Component\Yaml deprecated constants
This commit is contained in:
Marco Pivetta 2017-08-16 20:52:18 +02:00 committed by GitHub
commit da109c36b7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -24,8 +24,11 @@
"doctrine/annotations": "~1.4", "doctrine/annotations": "~1.4",
"symfony/console": "~3.0|~4.0" "symfony/console": "~3.0|~4.0"
}, },
"conflict": {
"symfony/yaml": "<3.4"
},
"require-dev": { "require-dev": {
"symfony/yaml": "~3.0|~4.0", "symfony/yaml": "~3.4|~4.0",
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^6.0"
}, },
"suggest": { "suggest": {

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

@ -806,10 +806,6 @@ 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));
} }
} }