php8 review

This commit is contained in:
fbsanchez 2022-01-13 12:43:55 +01:00
parent d8d5bb3a21
commit 32c0229966
7 changed files with 42 additions and 15 deletions

View File

@ -833,7 +833,7 @@ class HTML
if (isset($cb_function) === true) {
call_user_func_array(
$cb_function,
(isset($cb_args) === true) ? $cb_args : []
array_values((isset($cb_args) === true) ? $cb_args : [])
);
}
} catch (Exception $e) {
@ -917,7 +917,7 @@ class HTML
if (isset($cb_function) === true) {
call_user_func_array(
$cb_function,
(isset($cb_args) === true) ? $cb_args : []
array_values((isset($cb_args) === true) ? $cb_args : [])
);
}
} catch (Exception $e) {
@ -1052,7 +1052,7 @@ class HTML
if (isset($cb_function) === true) {
call_user_func_array(
$cb_function,
(isset($cb_args) === true) ? $cb_args : []
array_values((isset($cb_args) === true) ? $cb_args : [])
);
}
} catch (Exception $e) {
@ -1066,7 +1066,7 @@ class HTML
if ($input['arguments']['type'] != 'submit') {
$output .= self::printBlockAsList($input, true);
} else {
$output_submit .= self::printBlockAsList($input, true);
$output_submit = self::printBlockAsList($input, true);
}
}

View File

@ -1546,7 +1546,10 @@ function enterprise_hook($function_name, $parameters=false)
return call_user_func($function_name);
}
return call_user_func_array($function_name, $parameters);
return call_user_func_array(
$function_name,
array_values(($parameters ?? []))
);
}
return ENTERPRISE_NOT_HOOK;

View File

@ -32,7 +32,10 @@ function extensions_call_main_function($filename)
$extension = &$config['extensions'][$filename];
if ($extension['main_function'] != '') {
$params = [];
call_user_func_array($extension['main_function'], $params);
call_user_func_array(
$extension['main_function'],
array_values(($params ?? []))
);
}
}
@ -49,7 +52,10 @@ function extensions_call_godmode_function($filename)
$extension = &$config['extensions'][$filename];
if ($extension['godmode_function'] != '') {
$params = [];
call_user_func_array($extension['godmode_function'], $params);
call_user_func_array(
$extension['godmode_function'],
array_values(($params ?? []))
);
}
}
@ -67,7 +73,10 @@ function extensions_call_login_function()
continue;
}
call_user_func_array($extension['login_function'], $params);
call_user_func_array(
$extension['login_function'],
array_values(($params ?? []))
);
}
}

View File

@ -137,7 +137,10 @@ function html_f2str($function, $params)
{
ob_start();
call_user_func_array($function, $params);
call_user_func_array(
$function,
array_values(($params ?? []))
);
return ob_get_clean();
}

View File

@ -409,7 +409,10 @@ function __($string /*, variable arguments */)
if (defined('METACONSOLE')) {
enterprise_include_once('meta/include/functions_meta.php');
$tranlateString = call_user_func_array('meta_get_defined_translation', func_get_args());
$tranlateString = call_user_func_array(
'meta_get_defined_translation',
array_values(func_get_args())
);
if ($tranlateString !== false) {
return $tranlateString;
@ -421,7 +424,10 @@ function __($string /*, variable arguments */)
) {
enterprise_include_once('extensions/translate_string/functions.php');
$tranlateString = call_user_func_array('get_defined_translation', func_get_args());
$tranlateString = call_user_func_array(
'get_defined_translation',
array_values(func_get_args())
);
if ($tranlateString !== false) {
return $tranlateString;
@ -477,7 +483,10 @@ function ___($string /*, variable arguments */)
foreach ($trace as $item) {
if (pathinfo($item['file'], PATHINFO_BASENAME) == $extension_file) {
$tranlateString = call_user_func_array($config['extensions'][$extension_file]['translate_function'], func_get_args());
$tranlateString = call_user_func_array(
$config['extensions'][$extension_file]['translate_function'],
array_values(func_get_args())
);
if ($tranlateString !== false) {
return $tranlateString;
}
@ -485,7 +494,10 @@ function ___($string /*, variable arguments */)
}
}
return call_user_func_array('__', func_get_args());
return call_user_func_array(
'__',
array_values(func_get_args())
);
}

View File

@ -3334,7 +3334,7 @@ function reporting_exception(
];
$return['chart']['hbar'] = call_user_func_array(
'hbar_graph',
$params
array_values(($params ?? []))
);
}

View File

@ -192,7 +192,7 @@ class WSManager extends WebSocketServer
$this->stderr('Calling '.$handler[$proto]);
return call_user_func_array(
$handler[$proto],
$arguments
array_values(($arguments ?? []))
);
}
}