From c98059e43d381d7dc9a12da8c17899cfeba8d693 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 26 Nov 2020 20:34:35 +0100
Subject: [PATCH] Short array syntax, CS fixes, tests

---
 program/lib/Roundcube/bootstrap.php |  22 ++--
 program/lib/Roundcube/html.php      | 186 ++++++++++++++--------------
 program/lib/Roundcube/rcube.php     | 151 +++++++++++-----------
 tests/Framework/Bootstrap.php       |  89 ++++++++-----
 tests/Framework/Html.php            | 122 +++++++++---------
 tests/Framework/Rcube.php           |  33 +++++
 6 files changed, 338 insertions(+), 265 deletions(-)

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index e80165a534d..d3f9486450e 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -25,7 +25,7 @@
  * @subpackage Core
  */
 
-$config = array(
+$config = [
     'error_reporting' => E_ALL & ~E_NOTICE & ~E_STRICT,
     'display_errors'  => false,
     'log_errors'      => true,
@@ -33,16 +33,16 @@
     // critical PHP settings here. Only these, which doesn't provide
     // an error/warning in the logs later. See (#1486307).
     'mbstring.func_overload' => 0,
-);
+];
 
 // check these additional ini settings if not called via CLI
 if (php_sapi_name() != 'cli') {
-    $config += array(
+    $config += [
         'suhosin.session.encrypt' => false,
         'file_uploads'            => true,
         'session.auto_start'      => false,
         'zlib.output_compression' => false,
-    );
+    ];
 }
 
 foreach ($config as $optname => $optval) {
@@ -109,7 +109,7 @@
  * @param string $needle   Needle value
  * @param array  $heystack Array to search in
  *
- * @return boolean True if found, False if not
+ * @return bool True if found, False if not
  */
 function in_array_nocase($needle, $haystack)
 {
@@ -279,7 +279,7 @@ function abbreviate_string($str, $maxlength, $placeholder = '...', $ending = fal
  */
 function array_keys_recursive($array)
 {
-    $keys = array();
+    $keys = [];
 
     if (!empty($array) && is_array($array)) {
         foreach ($array as $key => $child) {
@@ -305,7 +305,7 @@ function array_keys_recursive($array)
 function asciiwords($str, $css_id = false, $replace_with = '')
 {
     $allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
-    return preg_replace("/[^$allowed]/i", $replace_with, $str);
+    return preg_replace("/[^$allowed]+/i", $replace_with, $str);
 }
 
 /**
@@ -378,8 +378,8 @@ function format_email($email)
 function version_parse($version)
 {
     return str_replace(
-        array('-stable', '-git'),
-        array('.0', '.99'),
+        ['-stable', '-git'],
+        ['.0', '.99'],
         $version
     );
 }
@@ -400,7 +400,7 @@ function idn_to_utf8($domain)
         static $idn, $loaded;
 
         if (!$loaded) {
-            $idn    = new Net_IDNA2(array('version' => '2008'));
+            $idn    = new Net_IDNA2(['version' => '2008']);
             $loaded = true;
         }
 
@@ -431,7 +431,7 @@ function idn_to_ascii($domain)
         static $idn, $loaded;
 
         if (!$loaded) {
-            $idn    = new Net_IDNA2(array('version' => '2008'));
+            $idn    = new Net_IDNA2(['version' => '2008']);
             $loaded = true;
         }
 
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index ef548918af0..546c4f7316d 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -27,14 +27,14 @@ class html
 {
     protected $tagname;
     protected $content;
-    protected $attrib  = array();
-    protected $allowed = array();
+    protected $attrib  = [];
+    protected $allowed = [];
 
     public static $doctype = 'xhtml';
     public static $lc_tags = true;
-    public static $common_attrib = array('id','class','style','title','align','unselectable','tabindex','role');
-    public static $containers    = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script','a');
-    public static $bool_attrib   = array('checked','multiple','disabled','selected','autofocus','readonly','required');
+    public static $common_attrib = ['id','class','style','title','align','unselectable','tabindex','role'];
+    public static $containers    = ['iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script','a'];
+    public static $bool_attrib   = ['checked','multiple','disabled','selected','autofocus','readonly','required'];
 
 
     /**
@@ -42,7 +42,7 @@ class html
      *
      * @param array $attrib Hash array with tag attributes
      */
-    public function __construct($attrib = array())
+    public function __construct($attrib = [])
     {
         if (is_array($attrib)) {
             $this->attrib = $attrib;
@@ -71,13 +71,13 @@ public function show()
      *
      * @return string The XHTML tag
      */
-    public static function tag($tagname, $attrib = array(), $content = null, $allowed = null)
+    public static function tag($tagname, $attrib = [], $content = null, $allowed = null)
     {
         if (is_string($attrib)) {
-            $attrib = array('class' => $attrib);
+            $attrib = ['class' => $attrib];
         }
 
-        $inline_tags = array('a','span','img');
+        $inline_tags = ['a', 'span', 'img'];
         $suffix = (isset($attrib['nl']) && $content && $attrib['nl'] && !in_array($tagname, $inline_tags)) ? "\n" : '';
 
         $tagname = self::$lc_tags ? strtolower($tagname) : $tagname;
@@ -98,14 +98,14 @@ public static function tag($tagname, $attrib = array(), $content = null, $allowe
      */
     public static function doctype($type)
     {
-        $doctypes = array(
+        $doctypes = [
             'html5'        => '<!DOCTYPE html>',
             'xhtml'        => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
             'xhtml-trans'  => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
             'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-        );
+        ];
 
-        if ($doctypes[$type]) {
+        if (!empty($doctypes[$type])) {
             self::$doctype = preg_replace('/-\w+$/', '', $type);
             return $doctypes[$type];
         }
@@ -125,10 +125,10 @@ public static function doctype($type)
     public static function div($attr = null, $cont = null)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
-        return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
+        return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, ['onclick']));
     }
 
     /**
@@ -143,7 +143,7 @@ public static function div($attr = null, $cont = null)
     public static function p($attr = null, $cont = null)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         return self::tag('p', $attr, $cont, self::$common_attrib);
@@ -152,7 +152,7 @@ public static function p($attr = null, $cont = null)
     /**
      * Derrived method to create <img />
      *
-     * @param mixed $attr Hash array with tag attributes or string with image source (src)
+     * @param string|array $attr Hash array with tag attributes or string with image source (src)
      *
      * @return string HTML code
      * @see html::tag()
@@ -160,18 +160,19 @@ public static function p($attr = null, $cont = null)
     public static function img($attr = null)
     {
         if (is_string($attr)) {
-            $attr = array('src' => $attr);
+            $attr = ['src' => $attr];
         }
 
-        return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
-            array('src','alt','width','height','border','usemap','onclick','onerror','onload')));
+        $allowed = ['src','alt','width','height','border','usemap','onclick','onerror','onload'];
+
+        return self::tag('img', $attr + ['alt' => ''], null, array_merge(self::$common_attrib, $allowed));
     }
 
     /**
      * Derrived method for link tags
      *
-     * @param mixed  $attr Hash array with tag attributes or string with link location (href)
-     * @param string $cont Link content
+     * @param string|array $attr Hash array with tag attributes or string with link location (href)
+     * @param string       $cont Link content
      *
      * @return string HTML code
      * @see html::tag()
@@ -179,18 +180,19 @@ public static function img($attr = null)
     public static function a($attr, $cont)
     {
         if (is_string($attr)) {
-            $attr = array('href' => $attr);
+            $attr = ['href' => $attr];
         }
 
-        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
-            array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
+        $allowed = ['href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup'];
+
+        return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, $allowed));
     }
 
     /**
      * Derrived method for inline span tags
      *
-     * @param mixed  $attr Hash array with tag attributes or string with class name
-     * @param string $cont Tag content
+     * @param string|array $attr Hash array with tag attributes or string with class name
+     * @param string       $cont Tag content
      *
      * @return string HTML code
      * @see html::tag()
@@ -198,7 +200,7 @@ public static function a($attr, $cont)
     public static function span($attr, $cont)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         return self::tag('span', $attr, $cont, self::$common_attrib);
@@ -207,8 +209,8 @@ public static function span($attr, $cont)
     /**
      * Derrived method for form element labels
      *
-     * @param mixed  $attr Hash array with tag attributes or string with 'for' attrib
-     * @param string $cont Tag content
+     * @param string|array $attr Hash array with tag attributes or string with 'for' attrib
+     * @param string       $cont Tag content
      *
      * @return string HTML code
      * @see html::tag()
@@ -216,18 +218,17 @@ public static function span($attr, $cont)
     public static function label($attr, $cont)
     {
         if (is_string($attr)) {
-            $attr = array('for' => $attr);
+            $attr = ['for' => $attr];
         }
 
-        return self::tag('label', $attr, $cont, array_merge(self::$common_attrib,
-            array('for','onkeypress')));
+        return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, ['for','onkeypress']));
     }
 
     /**
      * Derrived method to create <iframe></iframe>
      *
-     * @param mixed  $attr Hash array with tag attributes or string with frame source (src)
-     * @param string $cont Tag content
+     * @param string|array $attr Hash array with tag attributes or string with frame source (src)
+     * @param string       $cont Tag content
      *
      * @return string HTML code
      * @see html::tag()
@@ -235,18 +236,19 @@ public static function label($attr, $cont)
     public static function iframe($attr = null, $cont = null)
     {
         if (is_string($attr)) {
-            $attr = array('src' => $attr);
+            $attr = ['src' => $attr];
         }
 
-        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib,
-            array('src','name','width','height','border','frameborder','onload','allowfullscreen')));
+        $allowed = ['src','name','width','height','border','frameborder','onload','allowfullscreen'];
+
+        return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib, $allowed));
     }
 
     /**
      * Derrived method to create <script> tags
      *
-     * @param mixed  $attr Hash array with tag attributes or string with script source (src)
-     * @param string $cont Javascript code to be placed as tag content
+     * @param string|array $attr Hash array with tag attributes or string with script source (src)
+     * @param string       $cont Javascript code to be placed as tag content
      *
      * @return string HTML code
      * @see html::tag()
@@ -254,7 +256,7 @@ public static function iframe($attr = null, $cont = null)
     public static function script($attr, $cont = null)
     {
         if (is_string($attr)) {
-            $attr = array('src' => $attr);
+            $attr = ['src' => $attr];
         }
 
         if ($cont) {
@@ -266,11 +268,11 @@ public static function script($attr, $cont = null)
         }
 
         if (self::$doctype == 'xhtml') {
-            $attr += array('type' => 'text/javascript');
+            $attr += ['type' => 'text/javascript'];
         }
 
-        return self::tag('script', $attr + array('nl' => true), $cont,
-            array_merge(self::$common_attrib, array('src', 'type', 'charset')));
+        return self::tag('script', $attr + ['nl' => true], $cont,
+            array_merge(self::$common_attrib, ['src', 'type', 'charset']));
     }
 
     /**
@@ -281,7 +283,7 @@ public static function script($attr, $cont = null)
      * @return string HTML code
      * @see html::tag()
      */
-    public static function br($attrib = array())
+    public static function br($attrib = [])
     {
         return self::tag('br', $attrib);
     }
@@ -294,14 +296,14 @@ public static function br($attrib = array())
      *
      * @return string Valid attribute string
      */
-    public static function attrib_string($attrib = array(), $allowed = null)
+    public static function attrib_string($attrib = [], $allowed = null)
     {
         if (empty($attrib)) {
             return '';
         }
 
-        $allowed_f  = array_flip((array)$allowed);
-        $attrib_arr = array();
+        $allowed_f  = array_flip((array) $allowed);
+        $attrib_arr = [];
 
         foreach ($attrib as $key => $value) {
             // skip size if not numeric
@@ -356,7 +358,7 @@ public static function attrib_string($attrib = array(), $allowed = null)
      */
     public static function parse_attrib_string($str)
     {
-        $attrib = array();
+        $attrib = [];
         $html   = '<html>'
             . '<head><meta http-equiv="Content-Type" content="text/html; charset=' . RCUBE_CHARSET . '" /></head>'
             . '<body><div ' . rtrim($str, '/ ') . ' /></body>'
@@ -398,19 +400,19 @@ class html_inputfield extends html
 {
     protected $tagname = 'input';
     protected $type    = 'text';
-    protected $allowed = array(
+    protected $allowed = [
         'type','name','value','size','tabindex','autocapitalize','required',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
         'spellcheck','results','maxlength','src','multiple','accept',
         'placeholder','autofocus','pattern','oninput'
-    );
+    ];
 
     /**
      * Object constructor
      *
      * @param array $attrib Associative array with tag attributes
      */
-    public function __construct($attrib = array())
+    public function __construct($attrib = [])
     {
         if (is_array($attrib)) {
             $this->attrib = $attrib;
@@ -468,8 +470,8 @@ class html_hiddenfield extends html
 {
     protected $tagname = 'input';
     protected $type    = 'hidden';
-    protected $allowed = array('type','name','value','onchange','disabled','readonly');
-    protected $fields  = array();
+    protected $allowed = ['type','name','value','onchange','disabled','readonly'];
+    protected $fields  = [];
 
     /**
      * Constructor
@@ -501,8 +503,9 @@ public function add($attrib)
     public function show()
     {
         $out = '';
+
         foreach ($this->fields as $attrib) {
-            $out .= self::tag($this->tagname, array('type' => $this->type) + $attrib);
+            $out .= self::tag($this->tagname, ['type' => $this->type] + $attrib);
         }
 
         return $out;
@@ -614,8 +617,8 @@ public function show($content = '', $attrib = null)
 class html_textarea extends html
 {
     protected $tagname = 'textarea';
-    protected $allowed = array('name','rows','cols','wrap','tabindex',
-        'onchange','disabled','readonly','spellcheck');
+    protected $allowed = ['name','rows','cols','wrap','tabindex',
+        'onchange','disabled','readonly','spellcheck'];
 
     /**
      * Get HTML code for this object
@@ -674,9 +677,9 @@ public function show($value = '', $attrib = null)
 class html_select extends html
 {
     protected $tagname = 'select';
-    protected $options = array();
-    protected $allowed = array('name','size','tabindex','autocomplete',
-        'multiple','onchange','disabled','rel');
+    protected $options = [];
+    protected $allowed = ['name','size','tabindex','autocomplete',
+        'multiple','onchange','disabled','rel'];
 
     /**
      * Add a new option to this drop-down
@@ -685,15 +688,15 @@ class html_select extends html
      * @param mixed $values Option value or array with option values
      * @param array $attrib Additional attributes for the option entry
      */
-    public function add($names, $values = null, $attrib = array())
+    public function add($names, $values = null, $attrib = [])
     {
         if (is_array($names)) {
             foreach ($names as $i => $text) {
-                $this->options[] = array('text' => $text, 'value' => $values[$i]) + $attrib;
+                $this->options[] = ['text' => $text, 'value' => $values[$i]] + $attrib;
             }
         }
         else {
-            $this->options[] = array('text' => $names, 'value' => $values) + $attrib;
+            $this->options[] = ['text' => $names, 'value' => $values] + $attrib;
         }
     }
 
@@ -705,7 +708,7 @@ public function add($names, $values = null, $attrib = array())
      *
      * @return string HTML output
      */
-    public function show($select = array(), $attrib = null)
+    public function show($select = [], $attrib = null)
     {
         // overwrite object attributes
         if (is_array($attrib)) {
@@ -713,19 +716,22 @@ public function show($select = array(), $attrib = null)
         }
 
         $this->content = "\n";
-        $select = (array)$select;
+        $select = (array) $select;
         foreach ($this->options as $option) {
-            $attr = array(
+            $attr = [
                 'value' => $option['value'],
                 'selected' => (in_array($option['value'], $select, true) ||
-                  in_array($option['text'], $select, true)) ? 1 : null);
+                    in_array($option['text'], $select, true)) ? 1 : null
+            ];
 
             $option_content = $option['text'];
             if (empty($this->attrib['is_escaped'])) {
                 $option_content = self::quote($option_content);
             }
 
-            $this->content .= self::tag('option', $attr + $option, $option_content, array('value','label','class','style','title','disabled','selected'));
+            $allowed = ['value','label','class','style','title','disabled','selected'];
+
+            $this->content .= self::tag('option', $attr + $option, $option_content, $allowed);
         }
 
         return parent::show();
@@ -742,11 +748,11 @@ public function show($select = array(), $attrib = null)
 class html_table extends html
 {
     protected $tagname = 'table';
-    protected $allowed = array('id','class','style','width','summary',
-        'cellpadding','cellspacing','border');
+    protected $allowed = ['id','class','style','width','summary',
+        'cellpadding','cellspacing','border'];
 
     private $header   = null;
-    private $rows     = array();
+    private $rows     = [];
     private $rowindex = 0;
     private $colindex = 0;
 
@@ -755,9 +761,9 @@ class html_table extends html
      *
      * @param array $attrib Named tag attributes
      */
-    public function __construct($attrib = array())
+    public function __construct($attrib = [])
     {
-        $default_attrib = self::$doctype == 'xhtml' ? array('border' => '0') : array();
+        $default_attrib = self::$doctype == 'xhtml' ? ['border' => '0'] : [];
         $this->attrib   = array_merge($attrib, $default_attrib);
 
         if (!empty($attrib['tagname']) && $attrib['tagname'] != 'table') {
@@ -775,7 +781,7 @@ public function __construct($attrib = array())
     public function add($attr, $cont)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         $cell = new stdClass;
@@ -798,13 +804,13 @@ public function add($attr, $cont)
     /**
      * Add a table header cell
      *
-     * @param array  $attr Cell attributes
-     * @param string $cont Cell content
+     * @param string|array $attr Cell attributes array or class name
+     * @param string       $cont Cell content
      */
     public function add_header($attr, $cont)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         $cell = new stdClass;
@@ -851,24 +857,24 @@ public function remove_column($class)
      *
      * @param array $attr Row attributes
      */
-    public function add_row($attr = array())
+    public function add_row($attr = [])
     {
         $this->rowindex++;
         $this->colindex = 0;
         $this->rows[$this->rowindex] = new stdClass;
         $this->rows[$this->rowindex]->attrib = $attr;
-        $this->rows[$this->rowindex]->cells  = array();
+        $this->rows[$this->rowindex]->cells  = [];
     }
 
     /**
      * Set header attributes
      *
-     * @param array $attr  Row attributes
+     * @param string|array $attr Row attributes array or class name
      */
-    public function set_header_attribs($attr = array())
+    public function set_header_attribs($attr = [])
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         if (empty($this->header)) {
@@ -881,13 +887,13 @@ public function set_header_attribs($attr = array())
     /**
      * Set row attributes
      *
-     * @param array $attr  Row attributes
-     * @param int   $index Optional row index (default current row index)
+     * @param string|array $attr  Row attributes array or class name
+     * @param int          $index Optional row index (default current row index)
      */
-    public function set_row_attribs($attr = array(), $index = null)
+    public function set_row_attribs($attr = [], $index = null)
     {
         if (is_string($attr)) {
-            $attr = array('class' => $attr);
+            $attr = ['class' => $attr];
         }
 
         if ($index === null) {
@@ -944,7 +950,7 @@ public function show($attrib = null)
                 $rowcontent .= self::tag($head_tagname, $col->attrib, $col->content);
             }
             $thead = $this->tagname == 'table' ? self::tag('thead', null, self::tag('tr', $this->header->attrib ?: null, $rowcontent, parent::$common_attrib)) :
-                self::tag($row_tagname, array('class' => 'thead'), $rowcontent, parent::$common_attrib);
+                self::tag($row_tagname, ['class' => 'thead'], $rowcontent, parent::$common_attrib);
         }
 
         foreach ($this->rows as $r => $row) {
@@ -990,7 +996,7 @@ public function size()
      */
     public function remove_body()
     {
-        $this->rows     = array();
+        $this->rows     = [];
         $this->rowindex = 0;
     }
 
@@ -999,7 +1005,7 @@ public function remove_body()
      */
     private function _row_tagname()
     {
-        static $row_tagnames = array('table' => 'tr', 'ul' => 'li', '*' => 'div');
+        static $row_tagnames = ['table' => 'tr', 'ul' => 'li', '*' => 'div'];
         return !empty($row_tagnames[$this->tagname]) ? $row_tagnames[$this->tagname] : $row_tagnames['*'];
     }
 
@@ -1008,7 +1014,7 @@ private function _row_tagname()
      */
     private function _head_tagname()
     {
-        static $head_tagnames = array('table' => 'th', '*' => 'span');
+        static $head_tagnames = ['table' => 'th', '*' => 'span'];
         return !empty($head_tagnames[$this->tagname]) ? $head_tagnames[$this->tagname] : $head_tagnames['*'];
     }
 
@@ -1017,7 +1023,7 @@ private function _head_tagname()
      */
     private function _col_tagname()
     {
-        static $col_tagnames = array('table' => 'td', '*' => 'span');
+        static $col_tagnames = ['table' => 'td', '*' => 'span'];
         return !empty($col_tagnames[$this->tagname]) ? $col_tagnames[$this->tagname] : $col_tagnames['*'];
     }
 }
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 1ebb289f268..817824ae62b 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -79,10 +79,10 @@ class rcube
     protected $texts;
 
     /** @var rcube_cache[] Initialized cache objects */
-    protected $caches = array();
+    protected $caches = [];
 
     /** @var array Registered shutdown functions */
-    protected $shutdown_functions = array();
+    protected $shutdown_functions = [];
 
     /** @var rcube Singleton instance of rcube */
     static protected $instance;
@@ -117,7 +117,7 @@ protected function __construct($env = '')
         $this->config  = new rcube_config($env);
         $this->plugins = new rcube_dummy_plugin_api;
 
-        register_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function([$this, 'shutdown']);
     }
 
     /**
@@ -314,11 +314,12 @@ public function storage_init()
         $driver_class = "rcube_{$driver}";
 
         if (!class_exists($driver_class)) {
-            self::raise_error(array(
-                'code' => 700, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Storage driver class ($driver) not found!"),
-                true, true);
+            self::raise_error([
+                    'code' => 700, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Storage driver class ($driver) not found!"
+                ],
+                true, true
+            );
         }
 
         // Initialize storage object
@@ -328,7 +329,7 @@ public function storage_init()
         $this->imap = $this->storage;
 
         // set class options
-        $options = array(
+        $options = [
             'auth_type'      => $this->config->get("{$driver}_auth_type", 'check'),
             'auth_cid'       => $this->config->get("{$driver}_auth_cid"),
             'auth_pw'        => $this->config->get("{$driver}_auth_pw"),
@@ -339,7 +340,7 @@ public function storage_init()
             'timeout'        => (int) $this->config->get("{$driver}_timeout"),
             'skip_deleted'   => (bool) $this->config->get('skip_deleted'),
             'driver'         => $driver,
-        );
+        ];
 
         if (!empty($_SESSION['storage_host'])) {
             $options['language'] = $_SESSION['language'];
@@ -361,7 +362,7 @@ public function storage_init()
 
         // subscribe to 'storage_connected' hook for session logging
         if ($this->config->get('imap_log_session', false)) {
-            $this->plugins->register_hook('storage_connected', array($this, 'storage_log_session'));
+            $this->plugins->register_hook('storage_connected', [$this, 'storage_log_session']);
         }
     }
 
@@ -385,6 +386,7 @@ protected function set_storage_prop()
         $driver         = $this->config->get('storage_driver', 'imap');
         $storage_cache  = $this->config->get("{$driver}_cache");
         $messages_cache = $this->config->get('messages_cache');
+
         // for backward compatybility
         if ($storage_cache === null && $messages_cache === null && $this->config->get('enable_caching')) {
             $storage_cache  = 'db';
@@ -394,6 +396,7 @@ protected function set_storage_prop()
         if ($storage_cache) {
             $storage->set_caching($storage_cache);
         }
+
         if ($messages_cache) {
             $storage->set_messages_caching(true);
         }
@@ -407,7 +410,7 @@ protected function set_special_folders()
     {
         $storage = $this->get_storage();
         $folders = $storage->get_special_folders(true);
-        $prefs   = array();
+        $prefs   = [];
 
         // check SPECIAL-USE flags on IMAP folders
         foreach ($folders as $type => $folder) {
@@ -492,7 +495,7 @@ public function session_init()
 
         // Start the session
         $this->session = rcube_session::factory($this->config);
-        $this->session->register_gc_handler(array($this, 'gc'));
+        $this->session->register_gc_handler([$this, 'gc']);
         $this->session->start();
     }
 
@@ -573,7 +576,7 @@ public function gettext($attrib, $domain = null)
 
         // extract attributes
         if (is_string($attrib)) {
-            $attrib = array('name' => $attrib);
+            $attrib = ['name' => $attrib];
         }
 
         $name = (string) $attrib['name'];
@@ -608,7 +611,7 @@ public function gettext($attrib, $domain = null)
         }
 
         // replace \n with real line break
-        $text = strtr($text, array('\n' => "\n"));
+        $text = strtr($text, ['\n' => "\n"]);
 
         // case folding
         if ((!empty($attrib['uppercase']) && strtolower($attrib['uppercase']) == 'first') || !empty($attrib['ucfirst'])) {
@@ -635,7 +638,7 @@ public function gettext($attrib, $domain = null)
      * @param string $domain      Label domain (plugin) name or '*' for all domains
      * @param string &$ref_domain Sets domain name if label is found
      *
-     * @return boolean True if text exists (either in the current language or in en_US)
+     * @return bool True if text exists (either in the current language or in en_US)
      */
     public function text_exists($name, $domain = null, &$ref_domain = null)
     {
@@ -674,7 +677,7 @@ public function text_exists($name, $domain = null, &$ref_domain = null)
      * @param array  $add   Additional text labels/messages
      * @param array  $merge Additional text labels/messages to merge
      */
-    public function load_language($lang = null, $add = array(), $merge = array())
+    public function load_language($lang = null, $add = [], $merge = [])
     {
         $sess_lang = !empty($_SESSION['language']) ? $_SESSION['language'] : 'en_US';
         $lang      = $this->language_prop($lang ?: $sess_lang);
@@ -682,10 +685,10 @@ public function load_language($lang = null, $add = array(), $merge = array())
         // load localized texts
         if (empty($this->texts) || $lang != $sess_lang) {
             // get english labels (these should be complete)
-            $files = array(
+            $files = [
                 RCUBE_LOCALIZATION_DIR . 'en_US/labels.inc',
                 RCUBE_LOCALIZATION_DIR . 'en_US/messages.inc',
-            );
+            ];
 
             // include user language files
             if ($lang != 'en' && $lang != 'en_US' && is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
@@ -693,7 +696,7 @@ public function load_language($lang = null, $add = array(), $merge = array())
                 $files[] = RCUBE_LOCALIZATION_DIR . $lang . '/messages.inc';
             }
 
-            $this->texts = array();
+            $this->texts = [];
 
             foreach ($files as $file) {
                 $this->texts = self::read_localization_file($file, $this->texts);
@@ -727,19 +730,19 @@ public function read_localization($dir, $lang = null)
         if ($lang == null) {
             $lang = $_SESSION['language'];
         }
-        $langs  = array_unique(array('en_US', $lang));
+        $langs  = array_unique(['en_US', $lang]);
         $locdir = slashify($dir);
-        $texts  = array();
+        $texts  = [];
 
         // Language aliases used to find localization in similar lang, see below
-        $aliases = array(
+        $aliases = [
             'de_CH' => 'de_DE',
             'es_AR' => 'es_ES',
             'fa_AF' => 'fa_IR',
             'nl_BE' => 'nl_NL',
             'pt_BR' => 'pt_PT',
             'zh_CN' => 'zh_TW',
-        );
+        ];
 
         foreach ($langs as $lng) {
             $fpath = $locdir . $lng . '.inc';
@@ -777,7 +780,7 @@ public function read_localization($dir, $lang = null)
      *
      * @return array Localization labels/messages
      */
-    public static function read_localization_file($file, $texts = array())
+    public static function read_localization_file($file, $texts = [])
     {
         if (is_file($file) && is_readable($file)) {
             $labels   = [];
@@ -857,7 +860,7 @@ protected function language_prop($lang)
      */
     public function list_languages()
     {
-        static $sa_languages = array();
+        static $sa_languages = [];
 
         if (!count($sa_languages)) {
             @include(RCUBE_LOCALIZATION_DIR . 'index.inc');
@@ -902,11 +905,11 @@ public function encrypt($clear, $key = 'des_key', $base64 = true)
         $cipher = openssl_encrypt($clear, $method, $ckey, $opts, $iv);
 
         if ($cipher === false) {
-            self::raise_error(array(
+            self::raise_error([
                     'file'    => __FILE__,
                     'line'    => __LINE__,
                     'message' => "Failed to encrypt data with configured cipher method: $method!"
-                ), true, false);
+                ], true, false);
 
             return false;
         }
@@ -964,8 +967,7 @@ public function get_secure_url_token($generate = false)
                 $length = $len > 1 ? $len : 16;
                 $token  = rcube_utils::random_bytes($length);
 
-                $plugin = $this->plugins->exec_hook('secure_token',
-                    array('value' => $token, 'length' => $length));
+                $plugin = $this->plugins->exec_hook('secure_token', ['value' => $token, 'length' => $length]);
 
                 $_SESSION['secure_token'] = $plugin['value'];
             }
@@ -984,8 +986,7 @@ public function get_secure_url_token($generate = false)
     public function get_request_token()
     {
         if (empty($_SESSION['request_token'])) {
-            $plugin = $this->plugins->exec_hook('request_token', array(
-                'value' => rcube_utils::random_bytes(32)));
+            $plugin = $this->plugins->exec_hook('request_token', ['value' => rcube_utils::random_bytes(32)]);
 
             $_SESSION['request_token'] = $plugin['value'];
         }
@@ -1197,20 +1198,20 @@ public static function exec(/* $cmd, $values1 = array(), ... */)
     {
         $args   = func_get_args();
         $cmd    = array_shift($args);
-        $values = $replacements = array();
+        $values = $replacements = [];
 
         // merge values into one array
         foreach ($args as $arg) {
-            $values += (array)$arg;
+            $values += (array) $arg;
         }
 
         preg_match_all('/({(-?)([a-z]\w*)})/', $cmd, $matches, PREG_SET_ORDER);
         foreach ($matches as $tags) {
             list(, $tag, $option, $key) = $tags;
-            $parts = array();
+            $parts = [];
 
             if ($option) {
-                foreach ((array)$values["-$key"] as $key => $value) {
+                foreach ((array) $values["-$key"] as $key => $value) {
                     if ($value === true || $value === false || $value === null) {
                         $parts[] = $value ? $key : "";
                     }
@@ -1222,7 +1223,7 @@ public static function exec(/* $cmd, $values1 = array(), ... */)
                 }
             }
             else {
-                foreach ((array)$values[$key] as $value) {
+                foreach ((array) $values[$key] as $value) {
                     $parts[] = escapeshellarg($value);
                 }
             }
@@ -1247,7 +1248,7 @@ public static function console()
 
         if (class_exists('rcube', false)) {
             $rcube  = self::get_instance();
-            $plugin = $rcube->plugins->exec_hook('console', array('args' => $args));
+            $plugin = $rcube->plugins->exec_hook('console', ['args' => $args]);
             if ($plugin['abort']) {
                 return;
             }
@@ -1255,7 +1256,7 @@ public static function console()
             $args = $plugin['args'];
         }
 
-        $msg = array();
+        $msg = [];
         foreach ($args as $arg) {
             $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
         }
@@ -1290,7 +1291,7 @@ public static function write_log($name, $line)
         // trigger logging hook
         if (is_object(self::$instance) && is_object(self::$instance->plugins)) {
             $log = self::$instance->plugins->exec_hook('write_log',
-                array('name' => $name, 'date' => $date, 'line' => $line));
+                ['name' => $name, 'date' => $date, 'line' => $line]);
 
             $name = $log['name'];
             $line = $log['line'];
@@ -1325,7 +1326,7 @@ public static function write_log($name, $line)
         // per-user logging is activated
         if (self::$instance && self::$instance->config->get('per_user_logging')
             && self::$instance->get_user_id()
-            && !in_array($name, array('userlogins', 'sendmail'))
+            && !in_array($name, ['userlogins', 'sendmail'])
         ) {
             $log_dir = self::$instance->get_user_log_dir();
             if (empty($log_dir) && $name !== 'errors') {
@@ -1368,26 +1369,26 @@ public static function write_log($name, $line)
      * @param bool $log       True to log the error
      * @param bool $terminate Terminate script execution
      */
-    public static function raise_error($arg = array(), $log = false, $terminate = false)
+    public static function raise_error($arg = [], $log = false, $terminate = false)
     {
         // handle PHP exceptions
         if ($arg instanceof Exception) {
-            $arg = array(
+            $arg = [
                 'code' => $arg->getCode(),
                 'line' => $arg->getLine(),
                 'file' => $arg->getFile(),
                 'message' => $arg->getMessage(),
-            );
+            ];
         }
         else if ($arg instanceof PEAR_Error) {
             $info = $arg->getUserInfo();
-            $arg  = array(
+            $arg  = [
                 'code'    => $arg->getCode(),
                 'message' => $arg->getMessage() . ($info ? ': ' . $info : ''),
-            );
+            ];
         }
         else if (is_string($arg)) {
-            $arg = array('message' => $arg);
+            $arg = ['message' => $arg];
         }
 
         if (empty($arg['code'])) {
@@ -1444,14 +1445,14 @@ public static function raise_error($arg = array(), $log = false, $terminate = fa
      */
     public static function log_bug($arg_arr)
     {
-        $program = strtoupper($arg_arr['type'] ?: 'php');
-        $uri     = $_SERVER['REQUEST_URI'];
+        $program = !empty($arg_arr['type']) ? strtoupper($arg_arr['type']) : 'PHP';
+        $uri     = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 
         // write error to local log file
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $post_query = array();
-            foreach (array('_task', '_action') as $arg) {
-                if ($_POST[$arg] && !$_GET[$arg]) {
+            $post_query = [];
+            foreach (['_task', '_action'] as $arg) {
+                if (isset($_POST[$arg]) && !isset($_GET[$arg])) {
                     $post_query[$arg] = $_POST[$arg];
                 }
             }
@@ -1467,7 +1468,8 @@ public static function log_bug($arg_arr)
             $arg_arr['message'],
             $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
             $_SERVER['REQUEST_METHOD'],
-            $uri);
+            $uri
+        );
 
         if (!self::write_log('errors', $log_entry)) {
             // send error to PHPs error handler if write_log didn't succeed
@@ -1686,12 +1688,12 @@ public function gen_message_id($sender = null)
     public function deliver_message(&$message, $from, $mailto, &$error,
         &$body_file = null, $options = null, $disconnect = false)
     {
-        $plugin = $this->plugins->exec_hook('message_before_send', array(
-            'message' => $message,
-            'from'    => $from,
-            'mailto'  => $mailto,
-            'options' => $options,
-        ));
+        $plugin = $this->plugins->exec_hook('message_before_send', [
+                'message' => $message,
+                'from'    => $from,
+                'mailto'  => $mailto,
+                'options' => $options,
+        ]);
 
         if ($plugin['abort']) {
             if (!empty($plugin['error'])) {
@@ -1721,7 +1723,7 @@ public function deliver_message(&$message, $from, $mailto, &$error,
         }
 
         // remove Bcc header and get the whole head of the message as string
-        $smtp_headers = $message->txtHeaders(array('Bcc' => null), true);
+        $smtp_headers = $message->txtHeaders(['Bcc' => null], true);
 
         if ($message->getParam('delay_file_io')) {
             // use common temp dir
@@ -1729,10 +1731,12 @@ public function deliver_message(&$message, $from, $mailto, &$error,
             $mime_result = $message->saveMessageBody($body_file);
 
             if (is_a($mime_result, 'PEAR_Error')) {
-                self::raise_error(array('code' => 650, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$mime_result->getMessage()),
-                    true, false);
+                self::raise_error([
+                        'code' => 650, 'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Could not create message: ".$mime_result->getMessage()
+                    ],
+                    true, false
+                );
                 return false;
             }
 
@@ -1753,15 +1757,17 @@ public function deliver_message(&$message, $from, $mailto, &$error,
         $error    = $this->smtp->get_error();
 
         if (!$sent) {
-            self::raise_error(array('code' => 800, 'type' => 'smtp',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => implode("\n", $response)), true, false);
+            self::raise_error([
+                    'code' => 800, 'type' => 'smtp',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => implode("\n", $response)
+                ], true, false);
 
             // allow plugins to catch sending errors with the same parameters as in 'message_before_send'
-            $this->plugins->exec_hook('message_send_error', $plugin + array('error' => $error));
+            $this->plugins->exec_hook('message_send_error', $plugin + ['error' => $error]);
         }
         else {
-            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body, 'message' => $message));
+            $this->plugins->exec_hook('message_sent', ['headers' => $headers, 'body' => $msg_body, 'message' => $message]);
 
             // remove MDN headers after sending
             unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
@@ -1776,7 +1782,8 @@ public function deliver_message(&$message, $from, $mailto, &$error,
                     rcube_utils::remote_addr(),
                     $headers['Message-ID'],
                     implode(', ', $mailto),
-                    !empty($response) ? implode('; ', $response) : ''));
+                    !empty($response) ? implode('; ', $response) : '')
+                );
             }
         }
 
@@ -1790,7 +1797,7 @@ public function deliver_message(&$message, $from, $mailto, &$error,
 
         // Add Bcc header back
         if (!empty($headers['Bcc'])) {
-            $message->headers(array('Bcc' => $headers['Bcc']), true);
+            $message->headers(['Bcc' => $headers['Bcc']], true);
         }
 
         return $sent;
@@ -1815,7 +1822,7 @@ class rcube_dummy_plugin_api
      * @return array Hook arguments
      * @see rcube_plugin_api::exec_hook()
      */
-    public function exec_hook($hook, $args = array())
+    public function exec_hook($hook, $args = [])
     {
         return $args;
     }
diff --git a/tests/Framework/Bootstrap.php b/tests/Framework/Bootstrap.php
index 6166330738d..dcc9b68a18a 100644
--- a/tests/Framework/Bootstrap.php
+++ b/tests/Framework/Bootstrap.php
@@ -8,12 +8,21 @@
 class Framework_Bootstrap extends PHPUnit\Framework\TestCase
 {
 
+    /**
+     * bootstrap.php: asciiwords()
+     */
+    function test_asciiwords()
+    {
+        $this->assertSame('abc.123', asciiwords('abc%.123', false));
+        $this->assertSame('abc-123', asciiwords('abc%.123', true, '-'));
+    }
+
     /**
      * bootstrap.php: in_array_nocase()
      */
     function test_in_array_nocase()
     {
-        $haystack = array('Test');
+        $haystack = ['Test'];
         $needle = 'test';
         $result = in_array_nocase($needle, $haystack);
 
@@ -29,22 +38,22 @@ function test_in_array_nocase()
      */
     function test_parse_bytes()
     {
-        $data = array(
+        $data = [
             '1'      => 1,
             '1024'   => 1024,
             '2k'     => 2 * 1024,
-            '2 k'     => 2 * 1024,
+            '2 k'    => 2 * 1024,
             '2kb'    => 2 * 1024,
             '2kB'    => 2 * 1024,
             '2m'     => 2 * 1048576,
-            '2 m'     => 2 * 1048576,
+            '2 m'    => 2 * 1048576,
             '2mb'    => 2 * 1048576,
             '2mB'    => 2 * 1048576,
             '2g'     => 2 * 1024 * 1048576,
-            '2 g'     => 2 * 1024 * 1048576,
+            '2 g'    => 2 * 1024 * 1048576,
             '2gb'    => 2 * 1024 * 1048576,
             '2gB'    => 2 * 1024 * 1048576,
-        );
+        ];
 
         foreach ($data as $value => $expected) {
             $result = parse_bytes($value);
@@ -57,12 +66,12 @@ function test_parse_bytes()
      */
     function test_slashify()
     {
-        $data = array(
+        $data = [
             'test'    => 'test/',
             'test/'   => 'test/',
             ''        => '/',
             "\\"      => "\\/",
-        );
+        ];
 
         foreach ($data as $value => $expected) {
             $result = slashify($value);
@@ -76,7 +85,7 @@ function test_slashify()
      */
     function test_unslashify()
     {
-        $data = array(
+        $data = [
             'test'      => 'test',
             'test/'     => 'test',
             '/'         => '',
@@ -84,7 +93,7 @@ function test_unslashify()
             'test/test' => 'test/test',
             'test//'    => 'test',
             '/test//'   => '/test',
-        );
+        ];
 
         foreach ($data as $value => $expected) {
             $result = unslashify($value);
@@ -98,7 +107,7 @@ function test_unslashify()
      */
     function test_get_offset_sec()
     {
-        $data = array(
+        $data = [
             '1s'    => 1,
             '1m'    => 1 * 60,
             '1h'    => 1 * 60 * 60,
@@ -106,7 +115,7 @@ function test_get_offset_sec()
             '1w'    => 1 * 60 * 60 * 24 * 7,
             '1y'    => (int) '1y',
             '100'   => 100,
-        );
+        ];
 
         foreach ($data as $value => $expected) {
             $result = get_offset_sec($value);
@@ -120,15 +129,15 @@ function test_get_offset_sec()
      */
     function test_array_keys_recursive()
     {
-        $input = array(
-            'one' => array(
-                'two' => array(
-                    'three' => array(),
+        $input = [
+            'one' => [
+                'two' => [
+                    'three' => [],
                     'four' => 'something',
-                ),
-            ),
+                ],
+            ],
             'five' => 'test',
-        );
+        ];
 
         $result     = array_keys_recursive($input);
         $input_str  = 'one,two,three,four,five';
@@ -137,24 +146,42 @@ function test_array_keys_recursive()
         $this->assertEquals($input_str, $result_str, "Invalid array_keys_recursive() result");
     }
 
+    /**
+     * bootstrap.php: abbreviate_string()
+     */
+    function test_abbreviate_string()
+    {
+        $data = [
+            // expected, string, maxlength, placeholder, $ending
+            ['', '', 10, '...', false],
+            ['1234.90abc', '1234567890abc', 10, '.', false],
+            ['żćżć.12345', 'żćżćżćżć12345', 10, '.', false],
+            // TODO: more cases
+        ];
+
+        foreach ($data as $set) {
+            $result = abbreviate_string($set[1], $set[2], $set[3], $set[4]);
+            $this->assertEquals($set[0], $result);
+        }
+    }
+
     /**
      * bootstrap.php: format_email()
      */
     function test_format_email()
     {
-        $data = array(
+        $data = [
             ''                 => '',
             'test'             => 'test',
             'test@test.tld'    => 'test@test.tld',
             'test@[127.0.0.1]' => 'test@[127.0.0.1]',
             'TEST@TEST.TLD'    => 'TEST@test.tld',
-        );
+        ];
 
         foreach ($data as $value => $expected) {
             $result = format_email($value);
             $this->assertEquals($expected, $result, "Invalid format_email() result for $value");
         }
-
     }
 
     /**
@@ -162,15 +189,15 @@ function test_format_email()
      */
     function test_format_email_recipient()
     {
-        $data = array(
-            ''                          => array(''),
-            'test'                      => array('test'),
-            'test@test.tld'             => array('test@test.tld'),
-            'test@[127.0.0.1]'          => array('test@[127.0.0.1]'),
-            'TEST@TEST.TLD'             => array('TEST@TEST.TLD'),
-            'TEST <test@test.tld>'      => array('test@test.tld', 'TEST'),
-            '"TEST\"" <test@test.tld>'  => array('test@test.tld', 'TEST"'),
-        );
+        $data = [
+            ''                          => [''],
+            'test'                      => ['test'],
+            'test@test.tld'             => ['test@test.tld'],
+            'test@[127.0.0.1]'          => ['test@[127.0.0.1]'],
+            'TEST@TEST.TLD'             => ['TEST@TEST.TLD'],
+            'TEST <test@test.tld>'      => ['test@test.tld', 'TEST'],
+            '"TEST\"" <test@test.tld>'  => ['test@test.tld', 'TEST"'],
+        ];
 
         foreach ($data as $expected => $value) {
             $result = format_email_recipient($value[0], isset($value[1]) ? $value[1] : null);
diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 01e2a491574..7407bcedc60 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -23,38 +23,38 @@ function test_class()
      */
     function data_attrib_string()
     {
-        return array(
-            array(
-                array(), null, '',
-            ),
-            array(
-                array('test' => 'test'), null, ' test="test"',
-            ),
-            array(
-                array('test' => 'test'), array('test'), ' test="test"',
-            ),
-            array(
-                array('test' => 'test'), array('other'), '',
-            ),
-            array(
-                array('checked' => true), null, ' checked="checked"',
-            ),
-            array(
-                array('checked' => ''), null, '',
-            ),
-            array(
-                array('onclick' => ''), null, '',
-            ),
-            array(
-                array('size' => 5), null, ' size="5"',
-            ),
-            array(
-                array('size' => 'test'), null, '',
-            ),
-            array(
-                array('data-test' => 'test'), null, ' data-test="test"',
-            ),
-        );
+        return [
+            [
+                [], null, '',
+            ],
+            [
+                ['test' => 'test'], null, ' test="test"',
+            ],
+            [
+                ['test' => 'test'], ['test'], ' test="test"',
+            ],
+            [
+                ['test' => 'test'], ['other'], '',
+            ],
+            [
+                ['checked' => true], null, ' checked="checked"',
+            ],
+            [
+                ['checked' => ''], null, '',
+            ],
+            [
+                ['onclick' => ''], null, '',
+            ],
+            [
+                ['size' => 5], null, ' size="5"',
+            ],
+            [
+                ['size' => 'test'], null, '',
+            ],
+            [
+                ['data-test' => 'test'], null, ' data-test="test"',
+            ],
+        ];
     }
 
     /**
@@ -71,15 +71,15 @@ function test_attrib_string($arg1, $arg2, $expected)
      */
     function data_quote()
     {
-        return array(
-            array('abc', 'abc'),
-            array('?', '?'),
-            array('"', '&quot;'),
-            array('<', '&lt;'),
-            array('>', '&gt;'),
-            array('&', '&amp;'),
-            array('&amp;', '&amp;amp;'),
-        );
+        return [
+            ['abc', 'abc'],
+            ['?', '?'],
+            ['"', '&quot;'],
+            ['<', '&lt;'],
+            ['>', '&gt;'],
+            ['&', '&amp;'],
+            ['&amp;', '&amp;amp;'],
+        ];
     }
 
     /**
@@ -96,32 +96,32 @@ function test_quote($str, $expected)
      */
     function data_parse_attrib_string()
     {
-        return array(
-            array(
+        return [
+            [
                 '',
-                array(),
-            ),
-            array(
+                [],
+            ],
+            [
                 'test="test1-val"',
-                array('test' => 'test1-val'),
-            ),
-            array(
+                ['test' => 'test1-val'],
+            ],
+            [
                 'test1="test1-val"    test2=test2-val',
-                array('test1' => 'test1-val', 'test2' => 'test2-val'),
-            ),
-            array(
+                ['test1' => 'test1-val', 'test2' => 'test2-val'],
+            ],
+            [
                 '   test1="test1\'val"    test2=\'test2"val\'   ',
-                array('test1' => 'test1\'val', 'test2' => 'test2"val'),
-            ),
-            array(
+                ['test1' => 'test1\'val', 'test2' => 'test2"val'],
+            ],
+            [
                 'expression="test == true ? \' test\' : \'\'" ',
-                array('expression' => 'test == true ? \' test\' : \'\''),
-            ),
-            array(
+                ['expression' => 'test == true ? \' test\' : \'\''],
+            ],
+            [
                 'href="http://domain.tld/страница"',
-                array('href' => 'http://domain.tld/страница'),
-            ),
-        );
+                ['href' => 'http://domain.tld/страница'],
+            ],
+        ];
     }
 
     /**
diff --git a/tests/Framework/Rcube.php b/tests/Framework/Rcube.php
index 3bec0be7b76..4b24f8ddfbc 100644
--- a/tests/Framework/Rcube.php
+++ b/tests/Framework/Rcube.php
@@ -17,4 +17,37 @@ function test_class()
 
         $this->assertInstanceOf('rcube', $object, "Class singleton");
     }
+
+    /**
+     * rcube::read_localization()
+     */
+    function test_read_localization()
+    {
+        $rcube = rcube::get_instance();
+        $result = $rcube->read_localization(INSTALL_PATH . 'plugins/acl/localization', 'pl_PL');
+
+        $this->assertSame('Zapis', $result['aclwrite']);
+    }
+
+    /**
+     * rcube::list_languages()
+     */
+    function test_list_languages()
+    {
+        $rcube = rcube::get_instance();
+        $result = $rcube->list_languages();
+
+        $this->assertSame('English (US)', $result['en_US']);
+    }
+
+    /**
+     * rcube::encrypt() and rcube::decrypt()
+     */
+    function test_encrypt_and_decrypt()
+    {
+        $rcube = rcube::get_instance();
+        $result = $rcube->decrypt($rcube->encrypt('test'));
+
+        $this->assertSame('test', $result);
+    }
 }