diff --git a/src/Helpers/IsHelper.php b/src/Helpers/IsHelper.php index 45001c9cb..fa4365881 100644 --- a/src/Helpers/IsHelper.php +++ b/src/Helpers/IsHelper.php @@ -23,12 +23,7 @@ class IsHelper */ public static function isPHP(string $version): bool { - static $_is_php; - $version = (string)$version; - if (!isset($_is_php[$version])) { - $_is_php[$version] = version_compare(PHP_VERSION, $version, '>='); - } - return $_is_php[$version]; + return version_compare(PHP_VERSION, $version, '>='); } /** diff --git a/src/Legacy/Dbs.php b/src/Legacy/Dbs.php index 355c903af..20cf24ad9 100644 --- a/src/Legacy/Dbs.php +++ b/src/Legacy/Dbs.php @@ -28,9 +28,9 @@ class Dbs /** * Dbs constructor * - * @param $cfg + * @param array $cfg */ - public function __construct($cfg) + public function __construct(array $cfg) { $this->cfg = $cfg['db']; $this->alias = $cfg['db_alias']; @@ -47,7 +47,7 @@ class Dbs * * @return mixed */ - public function get_db_obj($srv_name_or_alias = 'db') + public function get_db_obj(string $srv_name_or_alias = 'db') { $srv_name = $this->get_srv_name($srv_name_or_alias); @@ -61,11 +61,11 @@ class Dbs /** * Определение имени сервера * - * @param $name + * @param string $name * * @return mixed|string */ - public function get_srv_name($name) + public function get_srv_name(string $name) { $srv_name = 'db'; diff --git a/src/Legacy/LogAction.php b/src/Legacy/LogAction.php index 48faeff2f..3acd78e8e 100644 --- a/src/Legacy/LogAction.php +++ b/src/Legacy/LogAction.php @@ -39,10 +39,10 @@ class LogAction } /** - * @param $type_name + * @param string $type_name * @param array $args */ - public function mod($type_name, array $args = []) + public function mod(string $type_name, array $args = []) { global $userdata; @@ -88,10 +88,10 @@ class LogAction } /** - * @param $type_name + * @param string $type_name * @param array $args */ - public function admin($type_name, array $args = []) + public function admin(string $type_name, array $args = []) { $this->mod($type_name, $args); } diff --git a/src/Legacy/Select.php b/src/Legacy/Select.php index e46e693c5..62b907a61 100644 --- a/src/Legacy/Select.php +++ b/src/Legacy/Select.php @@ -22,11 +22,10 @@ class Select * @param string $select_name * @return string */ - public static function language($default_lang, $select_name = 'language') + public static function language(string $default_lang, string $select_name = 'language') { global $bb_cfg; - $lang_default = reset($bb_cfg['lang']); $lang_select = ''; - return ($x > 1) ? $lang_select : $lang_default['name']; + return ($x > 1) ? $lang_select : reset($bb_cfg['lang']); } /** @@ -49,7 +48,7 @@ class Select * * @return string */ - public static function timezone($default, $select_name = 'timezone') + public static function timezone(string $default, string $select_name = 'timezone'): string { global $sys_timezone, $lang; @@ -75,7 +74,7 @@ class Select * * @return string */ - public static function template($default_style, $select_name = 'tpl_name') + public static function template(string $default_style, string $select_name = 'tpl_name') { global $bb_cfg;