deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replaced func_get_args() by ...$params (PHP 5.6+).

Browse source
This commit is contained in:
Dmitry Khomutov 2018-03-02 23:59:35 +07:00
commit 5d9b56d194
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/PHPCensor/Builder.php
View file

@ -278,11 +278,13 @@ class Builder implements LoggerAwareInterface
/**
* Used by this class, and plugins, to execute shell commands.
*
* @param array ...$params
*
* @return boolean
*/
public function executeCommand()
public function executeCommand(...$params)
{
return $this->commandExecutor->executeCommand(func_get_args());
return $this->commandExecutor->executeCommand($params);
}
/**

24
src/PHPCensor/Helper/Lang.php
View file

@ -37,19 +37,19 @@ class Lang
/**
* Get a specific string from the language file.
*
* @param $string
* @return mixed|string
* @param string $string
* @param array ...$params
*
* @return string
*/
public static function get($string)
public static function get($string, ...$params)
{
$vars = func_get_args();
if (array_key_exists($string, self::$strings)) {
$vars[0] = self::$strings[$string];
return call_user_func_array('sprintf', $vars);
$params[0] = self::$strings[$string];
return call_user_func_array('sprintf', $params);
} elseif (self::DEFAULT_LANGUAGE !== self::$language && array_key_exists($string, self::$default_strings)) {
$vars[0] = self::$default_strings[$string];
return call_user_func_array('sprintf', $vars);
$params[0] = self::$default_strings[$string];
return call_user_func_array('sprintf', $params);
}
return $string;
@ -57,10 +57,12 @@ class Lang
/**
* Output a specific string from the language file.
*
* @param array ...$params
*/
public static function out()
public static function out(...$params)
{
print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], func_get_args());
print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], $params);
}
/**

2
tests/bootstrap.php
View file

@ -35,7 +35,7 @@ $conf['php-censor']['url'] = 'http://php-censor.local';
$config = new b8\Config($conf);
if (!defined('APP_URL') && !empty($config)) {
if (!defined('APP_URL')) {
define('APP_URL', $config->get('php-censor.url', '') . '/');
}