From 3f1695db039101d44d611f0d1781d1ba034034dd Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 5 Apr 2023 16:19:14 +0200 Subject: PHPStan 6 for CLI (#5258) * PHPStan 6 for CLI Except `./cli/i18n/` * Bool * One type forgotten --- cli/_cli.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'cli/_cli.php') diff --git a/cli/_cli.php b/cli/_cli.php index 13f4c62a2..8a6b13007 100644 --- a/cli/_cli.php +++ b/cli/_cli.php @@ -18,12 +18,13 @@ Minz_Translate::init('en'); FreshRSS_Context::$isCli = true; -function fail($message, $exitCode = 1) { +/** @return never */ +function fail(string $message, int $exitCode = 1) { fwrite(STDERR, $message . "\n"); die($exitCode); } -function cliInitUser($username) { +function cliInitUser(string $username): string { if (!FreshRSS_user_Controller::checkUsername($username)) { fail('FreshRSS error: invalid username: ' . $username . "\n"); } @@ -42,19 +43,20 @@ function cliInitUser($username) { return $username; } -function accessRights() { +function accessRights(): void { echo 'ℹ️ Remember to re-apply the appropriate access rights, such as:', "\t", 'sudo cli/access-permissions.sh', "\n"; } -function done($ok = true) { +/** @return never */ +function done(bool $ok = true) { if (!$ok) { fwrite(STDERR, (empty($_SERVER['argv'][0]) ? 'Process' : basename($_SERVER['argv'][0])) . ' failed!' . "\n"); } exit($ok ? 0 : 1); } -function performRequirementCheck($databaseType) { +function performRequirementCheck(string $databaseType): void { $requirements = checkRequirements($databaseType); if ($requirements['all'] !== 'ok') { $message = 'FreshRSS failed requirements:' . "\n"; @@ -70,7 +72,11 @@ function performRequirementCheck($databaseType) { } } -function getLongOptions($options, $regex) { +/** + * @param array $options + * @return array + */ +function getLongOptions(array $options, string $regex): array { $longOptions = array_filter($options, function($a) use ($regex) { return preg_match($regex, $a); }); @@ -79,7 +85,11 @@ function getLongOptions($options, $regex) { }, $longOptions); } -function validateOptions($input, $params) { +/** + * @param array $input + * @param array $params + */ +function validateOptions(array $input, array $params): bool { $sanitizeInput = getLongOptions($input, REGEX_INPUT_OPTIONS); $sanitizeParams = getLongOptions($params, REGEX_PARAM_OPTIONS); $unknownOptions = array_diff($sanitizeInput, $sanitizeParams); -- cgit v1.2.3