From 13d32e792aa565fa50e2fe3768e3c01b6da2e88a Mon Sep 17 00:00:00 2001 From: zak956 Date: Fri, 13 May 2016 15:06:24 +0300 Subject: [PATCH 1/3] fix parsing YAML file (YAML::parse() accepts YAML content, not filename) --- src/Igorw/Silex/YamlConfigDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Igorw/Silex/YamlConfigDriver.php b/src/Igorw/Silex/YamlConfigDriver.php index 5b849a9..03d1bb3 100644 --- a/src/Igorw/Silex/YamlConfigDriver.php +++ b/src/Igorw/Silex/YamlConfigDriver.php @@ -11,7 +11,7 @@ public function load($filename) if (!class_exists('Symfony\\Component\\Yaml\\Yaml')) { throw new \RuntimeException('Unable to read yaml as the Symfony Yaml Component is not installed.'); } - $config = Yaml::parse($filename); + $config = Yaml::parse(file_get_contents($filename)); return $config ?: array(); } From 7ddd304e1a9a1826418981c07e974635e4f11229 Mon Sep 17 00:00:00 2001 From: zak956 Date: Fri, 13 May 2016 15:09:46 +0300 Subject: [PATCH 2/3] fix JSON parsing (json_decode throws error on empty json file, added return empty array for empty json) --- src/Igorw/Silex/JsonConfigDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Igorw/Silex/JsonConfigDriver.php b/src/Igorw/Silex/JsonConfigDriver.php index c9c8680..c2d3c76 100644 --- a/src/Igorw/Silex/JsonConfigDriver.php +++ b/src/Igorw/Silex/JsonConfigDriver.php @@ -25,7 +25,7 @@ public function supports($filename) private function parseJson($filename) { $json = file_get_contents($filename); - return json_decode($json, true); + return empty($json) ? [] : json_decode($json, true); } private function getJsonError($code) From 716fa7bedad71b5aed8fc847b1c6e08a47a23c84 Mon Sep 17 00:00:00 2001 From: zak956 Date: Fri, 13 May 2016 15:17:14 +0300 Subject: [PATCH 3/3] fixed empty array --- src/Igorw/Silex/JsonConfigDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Igorw/Silex/JsonConfigDriver.php b/src/Igorw/Silex/JsonConfigDriver.php index c2d3c76..949fe0f 100644 --- a/src/Igorw/Silex/JsonConfigDriver.php +++ b/src/Igorw/Silex/JsonConfigDriver.php @@ -25,7 +25,7 @@ public function supports($filename) private function parseJson($filename) { $json = file_get_contents($filename); - return empty($json) ? [] : json_decode($json, true); + return empty($json) ? array() : json_decode($json, true); } private function getJsonError($code)