From 9eef95f8c9065759eb8a89a56ea00d59a8310b5a Mon Sep 17 00:00:00 2001 From: Roy Klopper Date: Mon, 1 Jun 2015 10:45:46 +0200 Subject: [PATCH 1/3] Updated YamlFileLoader to be compatible with Symfony 2.7 and up --- src/lib/Herrera/Wise/Loader/YamlFileLoader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/Herrera/Wise/Loader/YamlFileLoader.php b/src/lib/Herrera/Wise/Loader/YamlFileLoader.php index 96a1a14..28dd2d2 100644 --- a/src/lib/Herrera/Wise/Loader/YamlFileLoader.php +++ b/src/lib/Herrera/Wise/Loader/YamlFileLoader.php @@ -26,6 +26,9 @@ public function supports($resource, $type = null) */ protected function doLoad($file) { - return Parser::parse($file); + if (!file_exists($file) || !is_readable($file)) { + throw new \InvalidArgumentException(sprintf('Unable to read file: %s', $file); + } + return Parser::parse(file_get_contents($file)); } } From dc50611e4c1616114add5ed44544f586bd5bcb00 Mon Sep 17 00:00:00 2001 From: Roy Klopper Date: Mon, 1 Jun 2015 10:46:08 +0200 Subject: [PATCH 2/3] Updated Wise to be compatible with Symfony 2.7 and up --- src/lib/Herrera/Wise/Wise.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/Herrera/Wise/Wise.php b/src/lib/Herrera/Wise/Wise.php index 9f3b57f..22c53de 100644 --- a/src/lib/Herrera/Wise/Wise.php +++ b/src/lib/Herrera/Wise/Wise.php @@ -212,6 +212,10 @@ public function load($resource, $type = null, $require = false) ); if ($cache->isFresh()) { + if (method_exists($cache, 'getPath')) { + /** @noinspection PhpIncludeInspection */ + return require $cache->getPath(); + } /** @noinspection PhpIncludeInspection */ return require $cache; } From aae7263816e95eabb82ef3dd02713f54fc7d89f9 Mon Sep 17 00:00:00 2001 From: Roy Klopper Date: Mon, 1 Jun 2015 10:51:28 +0200 Subject: [PATCH 3/3] Fixed missing closing bracket --- src/lib/Herrera/Wise/Loader/YamlFileLoader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Herrera/Wise/Loader/YamlFileLoader.php b/src/lib/Herrera/Wise/Loader/YamlFileLoader.php index 28dd2d2..9f9d97c 100644 --- a/src/lib/Herrera/Wise/Loader/YamlFileLoader.php +++ b/src/lib/Herrera/Wise/Loader/YamlFileLoader.php @@ -27,7 +27,7 @@ public function supports($resource, $type = null) protected function doLoad($file) { if (!file_exists($file) || !is_readable($file)) { - throw new \InvalidArgumentException(sprintf('Unable to read file: %s', $file); + throw new \InvalidArgumentException(sprintf('Unable to read file: %s', $file)); } return Parser::parse(file_get_contents($file)); }