refactor(array/function): move setDefault to \Rid class

Rhilip · Jul 22, 2019 · b49d529 · b49d529
1 parent 854722a
commit b49d529
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/framework/Rid.php b/framework/Rid.php
@@ -90,4 +90,13 @@ public static function createObject($config)
         return new $class($config);
     }
 
+    public static function setDefault(&$array, $defaults)
+    {
+        if (!is_array($array)) $array = [$array];
+        foreach ($defaults as  $key => $default) {
+            if (!array_key_exists($key, $array)) {
+                $array[$key] = $default;
+            }
+        }
+    }
 }
diff --git a/framework/View/Conversion.php b/framework/View/Conversion.php
@@ -40,7 +40,7 @@ public static function setDefault(&$array, $defaults)
 
     public function format_bytes($var)
     {
-        self::setDefault($var, ['precision' => 2, 'separator' => ' ']);
+        \Rid::setDefault($var, ['precision' => 2, 'separator' => ' ']);
         $bytes = array_shift($var);
 
         $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
@@ -56,19 +56,19 @@ public function format_bytes($var)
 
     public function format_bytes_compact($var)
     {
-        self::setDefault($var, ['precision' => 2, 'separator' => '<br />']);
+        \Rid::setDefault($var, ['precision' => 2, 'separator' => '<br />']);
         return $this->format_bytes($var);
     }
 
     public function format_bytes_loose($var)
     {
-        self::setDefault($var, ['precision' => 2, 'separator' => '&nbsp;']);
+        \Rid::setDefault($var, ['precision' => 2, 'separator' => '&nbsp;']);
         return $this->format_bytes($var);
     }
 
     public function format_ubbcode($var)
     {
-        self::setDefault($var, ['escapeHtml' => true]);
+        \Rid::setDefault($var, ['escapeHtml' => true]);
         $string = array_shift($var);
 
         $code = new Decoda($string, $var,'Cache:post:' . md5($string));