diff --git a/composer.json b/composer.json index d632c8991..fd4ddd963 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,11 @@ "doctrine/annotations": "~1.4", "symfony/console": "~3.0|~4.0" }, + "conflict": { + "symfony/yaml": "<3.4" + }, "require-dev": { - "symfony/yaml": "~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0", "phpunit/phpunit": "^6.0" }, "suggest": { diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index c4fb45ece..fa5201393 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -806,10 +806,6 @@ class YamlDriver extends FileDriver */ 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)); } }