From d3b1bf571bf01bc85d4f6b2732c70d2a44647e10 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 4 Dec 2014 13:37:59 +0100 Subject: [PATCH] #1200 - removing `Yaml::parse()` deprecation errors by passing in file contents instead of file paths --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 2 +- lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index c492c0f54..cf1dc5bc0 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -788,6 +788,6 @@ class YamlDriver extends FileDriver */ protected function loadMappingFile($file) { - return Yaml::parse($file); + return Yaml::parse(file_get_contents($file)); } } diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index 540945388..8003000ce 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -77,10 +77,10 @@ class ConvertDoctrine1Schema if (is_dir($path)) { $files = glob($path . '/*.yml'); foreach ($files as $file) { - $schema = array_merge($schema, (array) Yaml::parse($file)); + $schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file))); } } else { - $schema = array_merge($schema, (array) Yaml::parse($path)); + $schema = array_merge($schema, (array) Yaml::parse(file_get_contents($file))); } }