malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#983 YAML

Browse Source 
Handles the exception but does not add error reporting
This commit is contained in:
Ulrich Block 2017-05-13 10:52:31 +02:00
parent eaffd5660b
commit 996a71466d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stuff/methods/class_app.php
View File

@ -996,6 +996,14 @@ class AppServer {
}
}
private function parseYML($string) {
try {
return Yaml::parse($string);
} catch (Exception $e) {
return new stdClass;
}
}
private function protectedSettingsToArray() {
$protectedString = '';
@ -1014,7 +1022,7 @@ class AppServer {
if (strlen($protectedString) > 0 and isset($configPathAndFile) and !isset($cvarProtectArray[$configPathAndFile]['cvars'])) {
if (in_array($cvarProtectArray[$configPathAndFile]['type'], array('yml', 'yaml', 'Yaml'))) {
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedYaml($replaceSettings, Yaml::parse($protectedString));
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedYaml($replaceSettings, $this->parseYML($protectedString));
} else if ($cvarProtectArray[$configPathAndFile]['type'] == 'xml') {
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedXML($replaceSettings, $this->xmlStringToObject($protectedString));
}
@ -1091,7 +1099,9 @@ class AppServer {
if (strlen($protectedString) > 0 and isset($configPathAndFile) and !isset($cvarProtectArray[$configPathAndFile]['cvars'])) {
if (in_array($cvarProtectArray[$configPathAndFile]['type'], array('yml', 'yaml', 'Yaml'))) {
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedYaml($replaceSettings, Yaml::parse($protectedString));
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedYaml($replaceSettings, $this->parseYML($protectedString));
//TODO
}/* else if ($cvarProtectArray[$configPathAndFile]['type'] == 'xml') {
$cvarProtectArray[$configPathAndFile]['cvars'] = $this->protectedXML($replaceSettings, $this->xmlStringToObject($protectedString));
@ -1343,7 +1353,7 @@ class AppServer {
} else if ($values['type'] === 'yml' or $values['type'] === 'Yaml' or $values['type'] === 'yaml') {
$ftpObect->writeContentToTemp($this->replaceYaml(Yaml::parse($configFileContent), $values['cvars']));
$ftpObect->writeContentToTemp($this->replaceYaml($this->parseYML($configFileContent), $values['cvars']));
//TODO
/* } else if ($values['type'] === 'xml') {