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

Custom YamlParser with native support - implementation

Browse Source
This commit is contained in:
Awilum
2018-12-17 22:12:27 +03:00
parent 2b6d564119
commit 81e31d1324
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flextype/Flextype.php
View File

@@ -17,7 +17,6 @@ use Flextype\Component\Session\Session;
use Flextype\Component\ErrorHandler\ErrorHandler;
use Flextype\Component\Registry\Registry;
use Flextype\Component\Filesystem\Filesystem;
use Symfony\Component\Yaml\Yaml;
class Flextype
{
@@ -149,8 +148,8 @@ class Flextype
if (Filesystem::fileExists($default_settings_file_path) && Filesystem::fileExists($site_settings_file_path)) {
// Get Flextype settings and Site settings
$default_settings = Yaml::parseFile($default_settings_file_path);
$site_settings = Yaml::parseFile($site_settings_file_path);
$default_settings = YamlParser::decode(Filesystem::getFileContent($default_settings_file_path));
$site_settings = YamlParser::decode(Filesystem::getFileContent($site_settings_file_path));
// Merge settings
$settings = array_merge($default_settings, $site_settings);