AgelxNash / DocLister

assets/lib/Helpers/Config.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     public function loadConfig($name)
     {
         //$this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
-        if (!is_scalar($name)) {
+        if ( ! is_scalar($name)) {
             $name = '';
         }
         $config = array();
@@ -117,7 +117,7 @@ 
 
         if (is_scalar($arr)) {
             $out = \jsonHelper::jsonDecode($arr, array('assoc' => true));
-            if (!is_array($out)) {
+            if ( ! is_array($out)) {
                 if ($sep) {
                     $out = array_filter(explode($sep, $arr));
                 } else {

Braces +30 added lines, -29 removed lines

@@ -4,15 +4,15 @@ 
 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
 require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
 
-class Config
-{
+class Config

+{

     private $_cfg = array();
     protected $fs = null;
     protected $path = '';
 
-    public function __construct($cfg = array())
-    {
-        if ($cfg) {
+    public function __construct($cfg = array())

+    {

+        if ($cfg) {

             $this->setConfig($cfg);
         }
         $this->fs = \Helpers\FS::getInstance();
@@ -22,7 +22,8 @@ 
      * @param $path
      * @return $this
      */
-    public function setPath($path) {
+    public function setPath($path)

+    {

         $this->path = $path;
 
         return $this;
@@ -34,21 +35,21 @@ 
      * @param $name string имя конфига
      * @return array массив с настройками
      */
-    public function loadConfig($name)
-    {
+    public function loadConfig($name)

+    {

         //$this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
-        if (!is_scalar($name)) {
+        if (!is_scalar($name)) {

             $name = '';
         }
         $config = array();
         $name = explode(";", $name);
-        foreach ($name as $cfgName) {
+        foreach ($name as $cfgName) {

             $cfgName = explode(":", $cfgName, 2);
-            if (empty($cfgName[1])) {
+            if (empty($cfgName[1])) {

                 $cfgName[1] = 'custom';
             }
             $cfgName[1] = rtrim($cfgName[1], '/');
-            switch ($cfgName[1]) {
+            switch ($cfgName[1]) {

                 case 'custom':
                 case 'core':
                     $configFile = $this->fs->relativePath($this->path) . "/config/{$cfgName[1]}/{$cfgName[0]}.json";
@@ -58,7 +59,7 @@ 
                     break;
             }
 
-            if ($this->fs->checkFile($configFile)) {
+            if ($this->fs->checkFile($configFile)) {

                 $json = file_get_contents(MODX_BASE_PATH . $configFile);
                 $config = array_merge($config, \jsonHelper::jsonDecode($json, array('assoc' => true), true));
             }
@@ -73,8 +74,8 @@ 
      * Получение всего списка настроек
      * @return array
      */
-    public function getConfig()
-    {
+    public function getConfig()

+    {

         return $this->_cfg;
     }
 
@@ -83,12 +84,12 @@ 
      * @param array $cfg массив настроек
      * @return int результат сохранения настроек
      */
-    public function setConfig($cfg, $overwrite = false)
-    {
-        if (is_array($cfg)) {
+    public function setConfig($cfg, $overwrite = false)

+    {

+        if (is_array($cfg)) {

             $this->_cfg = $overwrite ? $cfg : array_merge($this->_cfg, $cfg);
             $ret = count($this->_cfg);
-        } else {
+        } else {

             $ret = false;
         }
 
@@ -100,8 +101,8 @@ 
      * @param null $def
      * @return mixed
      */
-    public function getCFGDef($name, $def = null)
-    {
+    public function getCFGDef($name, $def = null)

+    {

         return \APIhelpers::getkey($this->_cfg, $name, $def);
     }
 
@@ -112,23 +113,23 @@ 
      * @param string $sep
      * @return array|mixed|\xNop
      */
-    public function loadArray($arr, $sep = ',')
-    {
+    public function loadArray($arr, $sep = ',')

+    {

 
-        if (is_scalar($arr)) {
+        if (is_scalar($arr)) {

             $out = \jsonHelper::jsonDecode($arr, array('assoc' => true));
-            if (!is_array($out)) {
-                if ($sep) {
+            if (!is_array($out)) {

+                if ($sep) {

                     $out = array_filter(explode($sep, $arr));
-                } else {
+                } else {

                     $out = array();
                 }
             }
 
             return $out;
-        } elseif (is_array($arr)) {
+        } elseif (is_array($arr)) {

             return $arr;
-        } else {
+        } else {

             return array();
         }
     }