Use + to merge configs

cakephp · Aug 24, 2015 · 3bc052a · 3bc052a
1 parent ec38318
commit 3bc052a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/I18n/Time.php b/src/I18n/Time.php
@@ -656,12 +656,13 @@ public static function listTimezones($filter = null, $country = null, $options =
                 'group' => $options,
             ];
         }
-        $options = array_merge([
+        $defaults = [
             'group' => true,
             'abbr' => false,
             'before' => ' - ',
             'after' => null,
-        ], $options);
+        ];
+        $options += $defaults;
         $group = $options['group'];
 
         $regex = null;