From 0fca416dec83de8ce0270d7e723c0573ac546aa9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 1 Feb 2019 23:19:39 +0300 Subject: [PATCH] Flextype Core: Flextype - code fixes according Scrutinizer Tests. It seems like Flextype\Component\Files...ult_settings_file_path) can also be of type false; however, parameter $input of Flextype\YamlParser::decode() does only seem to accept string, maybe add an additional type check? Fixed --- flextype/Flextype.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flextype/Flextype.php b/flextype/Flextype.php index fb7b3875..6daefbfe 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -151,12 +151,12 @@ class Flextype $default_settings_file_path = PATH['config']['default'] . '/settings.yaml'; $site_settings_file_path = PATH['config']['site'] . '/settings.yaml'; + $default_settings = []; + $site_settings = []; + // Set settings if Flextype settings and Site settings config files exist if (Filesystem::has($default_settings_file_path) && Filesystem::has($site_settings_file_path)) { - $default_settings = []; - $site_settings = []; - if (($content = Filesystem::read($default_settings_file_path)) === false) { throw new \RuntimeException('Load file: ' . $default_settings_file_path . ' - failed!'); } else {