@@ -93,7 +93,7 @@ |
||
93 | 93 | { |
94 | 94 | $new = array(); |
95 | 95 | |
96 | - foreach($obj as $key => $val) |
|
96 | + foreach ($obj as $key => $val) |
|
97 | 97 | { |
98 | 98 | $new[$key] = self::objectToArray($val); |
99 | 99 | } |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | $again = true; |
40 | 40 | $new_config[$param . $glue . $key] = $value; |
41 | 41 | } |
42 | + } else { |
|
43 | + $new_config[$param] = $configure; |
|
42 | 44 | } |
43 | - else |
|
44 | - $new_config[$param] = $configure; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | return (!$again) ? $new_config : self::toUnidimensional($new_config, $glue); |
@@ -64,15 +64,17 @@ discard block |
||
64 | 64 | |
65 | 65 | do |
66 | 66 | { |
67 | - if (array_key_exists($key, $haystack)) |
|
68 | - $haystack = $haystack[$key]; |
|
69 | - else |
|
70 | - return $value; |
|
67 | + if (array_key_exists($key, $haystack)) { |
|
68 | + $haystack = $haystack[$key]; |
|
69 | + } else { |
|
70 | + return $value; |
|
71 | + } |
|
71 | 72 | |
72 | 73 | $key = count($needle) ? array_shift($needle) : NULL; |
73 | 74 | |
74 | - if (is_null($key)) |
|
75 | - return $haystack; |
|
75 | + if (is_null($key)) { |
|
76 | + return $haystack; |
|
77 | + } |
|
76 | 78 | |
77 | 79 | } while (!is_null($key)); |
78 | 80 | } |
@@ -86,8 +88,9 @@ discard block |
||
86 | 88 | */ |
87 | 89 | public static function objectToArray($obj) |
88 | 90 | { |
89 | - if (is_object($obj)) |
|
90 | - $obj = (array) $obj; |
|
91 | + if (is_object($obj)) { |
|
92 | + $obj = (array) $obj; |
|
93 | + } |
|
91 | 94 | |
92 | 95 | if (is_array($obj)) |
93 | 96 | { |
@@ -97,9 +100,9 @@ discard block |
||
97 | 100 | { |
98 | 101 | $new[$key] = self::objectToArray($val); |
99 | 102 | } |
103 | + } else { |
|
104 | + $new = $obj; |
|
100 | 105 | } |
101 | - else |
|
102 | - $new = $obj; |
|
103 | 106 | |
104 | 107 | return $new; |
105 | 108 | } |