@@ -40,20 +40,20 @@ |
||
40 | 40 | $array = $original; |
41 | 41 | foreach ($merging as $m_key => $m_val) { |
42 | 42 | if (\array_key_exists($m_key, $original)) { |
43 | - $orig_type = \gettype($original[ $m_key ]); |
|
43 | + $orig_type = \gettype($original[$m_key]); |
|
44 | 44 | $m_type = \gettype($m_val); |
45 | 45 | if ($orig_type !== $m_type) { |
46 | 46 | throw new Ex\IncompatibleTypeException( |
47 | 47 | "mergeConfig(): Cannot merge '{$m_type}' into '{$orig_type}' for key '{$m_key}'."); |
48 | 48 | } |
49 | 49 | |
50 | - if (\is_array($merging[ $m_key ])) { |
|
51 | - $array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val); |
|
50 | + if (\is_array($merging[$m_key])) { |
|
51 | + $array[$m_key] = static::mergeConfig($original[$m_key], $m_val); |
|
52 | 52 | } else { |
53 | - $array[ $m_key ] = $m_val; |
|
53 | + $array[$m_key] = $m_val; |
|
54 | 54 | } |
55 | 55 | } else { |
56 | - $array[ $m_key ] = $m_val; |
|
56 | + $array[$m_key] = $m_val; |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 |
@@ -359,11 +359,11 @@ discard block |
||
359 | 359 | $data = (new Converter())->convert($data); |
360 | 360 | if ($data !== null && !\is_object($data)) { |
361 | 361 | // ensure we get object in final JSON structure in data node |
362 | - $data = (object)$data; |
|
362 | + $data = (object) $data; |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | if ($data === null && Config::get(RB::CONF_KEY_DATA_ALWAYS_OBJECT, false)) { |
366 | - $data = (object)[]; |
|
366 | + $data = (object) []; |
|
367 | 367 | } |
368 | 368 | |
369 | 369 | // get human readable message for API code or use message string (if given instead of API code) |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | |
386 | 386 | if ($debug_data !== null) { |
387 | 387 | $debug_key = Config::get(RB::CONF_KEY_DEBUG_DEBUG_KEY, RB::KEY_DEBUG); |
388 | - $response[ $debug_key ] = $debug_data; |
|
388 | + $response[$debug_key] = $debug_data; |
|
389 | 389 | } |
390 | 390 | |
391 | 391 | return $response; |