From bb994b9e700595941b4abf660e886d7f98270ad8 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 16 Aug 2017 20:20:22 +0200 Subject: [PATCH 1/2] Removing reference to deprecated YAML component constant that is ignored after symfony 3.4 --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 4 ---- 1 file changed, 4 deletions(-) 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)); } } From 40515472c109b636bf857676232e0619cf182883 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 16 Aug 2017 20:21:26 +0200 Subject: [PATCH 2/2] Bumping ORM YAML dependency to 3.4+, explicitly forbidding compatibility with older YAML component versions --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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": {