mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-11 15:44:49 +02:00
Code Issues Releases Wiki Activity

Flextype Core: Flextype - code fixes according Scrutinizer Tests.

Browse Source 
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
This commit is contained in:
Awilum
2019-02-01 23:15:10 +03:00
parent f9ac8aba46
commit 2dcb6dc5d5
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
flextype/Flextype.php
View File

@@ -154,9 +154,20 @@ class Flextype
// Set settings if Flextype settings and Site settings config files exist
if (Filesystem::has($default_settings_file_path) && Filesystem::has($site_settings_file_path)) {
// Get Flextype settings and Site settings
$default_settings = YamlParser::decode(Filesystem::read($default_settings_file_path));
$site_settings = YamlParser::decode(Filesystem::read($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 {
$default_settings = YamlParser::decode($content);
}
if (($content = Filesystem::read($site_settings_file_path)) === false) {
throw new \RuntimeException('Load file: ' . $site_settings_file_path . ' - failed!');
} else {
$site_settings = YamlParser::decode($content);
}
// Merge settings
$settings = array_replace_recursive($default_settings, $site_settings);