Minor improvements (#784)

This commit is contained in:
Roman Kelesidis 2023-06-06 21:38:06 +07:00 committed by GitHub
commit 5b566ea2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 20 deletions

View file

@ -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, '>=');
}
/**

View file

@ -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';

View file

@ -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);
}

View file

@ -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 = '<select name="' . $select_name . '">';
$x = 0;
foreach ($bb_cfg['lang'] as $key => $data) {
@ -38,7 +37,7 @@ class Select
$x++;
}
$lang_select .= '</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;