diff options
| author | 2023-05-11 13:02:04 +0200 | |
|---|---|---|
| committer | 2023-05-11 13:02:04 +0200 | |
| commit | 6e2f2f1c1e98ecd86aa89c6547beb742d7385d18 (patch) | |
| tree | 7ba9f5aebb01d12045b9067a86b5060ba13dca18 /cli | |
| parent | fe7d9bbcd68660a59b813346c236b61b25a51c80 (diff) | |
A few additional PHPStan rules (#5388)
A subset of
https://github.com/phpstan/phpstan-strict-rules
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/_cli.php | 2 | ||||
| -rwxr-xr-x | cli/do-install.php | 2 | ||||
| -rw-r--r-- | cli/i18n/I18nData.php | 2 | ||||
| -rw-r--r-- | cli/i18n/I18nUsageValidator.php | 4 | ||||
| -rw-r--r-- | cli/i18n/I18nValue.php | 2 | ||||
| -rwxr-xr-x | cli/manipulate.translation.php | 2 | ||||
| -rwxr-xr-x | cli/reconfigure.php | 2 | ||||
| -rwxr-xr-x | cli/user-info.php | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/cli/_cli.php b/cli/_cli.php index 710e26605..9c62f3b4c 100644 --- a/cli/_cli.php +++ b/cli/_cli.php @@ -61,7 +61,7 @@ function performRequirementCheck(string $databaseType): void { if ($requirements['all'] !== 'ok') { $message = 'FreshRSS failed requirements:' . "\n"; foreach ($requirements as $requirement => $check) { - if ($check !== 'ok' && !in_array($requirement, array('all', 'pdo', 'message'))) { + if ($check !== 'ok' && !in_array($requirement, ['all', 'pdo', 'message'], true)) { $message .= '• ' . $requirement . "\n"; } } diff --git a/cli/do-install.php b/cli/do-install.php index 0654c36cf..58fcb2254 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -80,7 +80,7 @@ if (!FreshRSS_user_Controller::checkUsername($options['default_user'])) { . '”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN); } -if (isset($options['auth_type']) && !in_array($options['auth_type'], array('form', 'http_auth', 'none'))) { +if (isset($options['auth_type']) && !in_array($options['auth_type'], ['form', 'http_auth', 'none'], true)) { fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none })'); } diff --git a/cli/i18n/I18nData.php b/cli/i18n/I18nData.php index 62ffd7ce1..9eb67406c 100644 --- a/cli/i18n/I18nData.php +++ b/cli/i18n/I18nData.php @@ -236,7 +236,7 @@ class I18nData { * @throws Exception */ public function addValue(string $key, string $value, string $language): void { - if (!in_array($language, $this->getAvailableLanguages())) { + if (!in_array($language, $this->getAvailableLanguages(), true)) { throw new Exception('The selected language does not exist.'); } if (!array_key_exists($this->getFilenamePrefix($key), $this->data[static::REFERENCE_LANGUAGE]) || diff --git a/cli/i18n/I18nUsageValidator.php b/cli/i18n/I18nUsageValidator.php index f507fbac3..0d85077f0 100644 --- a/cli/i18n/I18nUsageValidator.php +++ b/cli/i18n/I18nUsageValidator.php @@ -42,10 +42,10 @@ class I18nUsageValidator implements I18nValidatorInterface { foreach ($this->reference as $file => $data) { foreach ($data as $key => $value) { $this->totalEntries++; - if (preg_match('/\._$/', $key) && in_array(preg_replace('/\._$/', '', $key), $this->code)) { + if (preg_match('/\._$/', $key) && in_array(preg_replace('/\._$/', '', $key), $this->code, true)) { continue; } - if (!in_array($key, $this->code)) { + if (!in_array($key, $this->code, true)) { $this->result .= sprintf('Unused key %s - %s', $key, $value) . PHP_EOL; $this->failedEntries++; continue; diff --git a/cli/i18n/I18nValue.php b/cli/i18n/I18nValue.php index c4746de03..295e5473e 100644 --- a/cli/i18n/I18nValue.php +++ b/cli/i18n/I18nValue.php @@ -24,7 +24,7 @@ class I18nValue { } $state = array_shift($data); - if (in_array($state, self::STATES)) { + if (in_array($state, self::STATES, true)) { $this->state = $state; } } diff --git a/cli/manipulate.translation.php b/cli/manipulate.translation.php index 947739384..4ef7101a3 100755 --- a/cli/manipulate.translation.php +++ b/cli/manipulate.translation.php @@ -28,7 +28,7 @@ switch ($options['a']) { $i18nData->addKey($options['k'], $options['v']); } elseif (array_key_exists('l', $options)) { $reference = null; - if (array_key_exists('o', $options) && is_string($options['o'])) { + if (array_key_exists('o', $options)) { $reference = $options['o']; } $i18nData->addLanguage($options['l'], $reference); diff --git a/cli/reconfigure.php b/cli/reconfigure.php index aefd1e20b..e6da4bddc 100755 --- a/cli/reconfigure.php +++ b/cli/reconfigure.php @@ -59,7 +59,7 @@ if (!FreshRSS_user_Controller::checkUsername(FreshRSS_Context::$system_conf->def } if (isset(FreshRSS_Context::$system_conf->auth_type) && - !in_array(FreshRSS_Context::$system_conf->auth_type, array('form', 'http_auth', 'none'))) { + !in_array(FreshRSS_Context::$system_conf->auth_type, ['form', 'http_auth', 'none'], true)) { fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none }: ' . FreshRSS_Context::$system_conf->auth_type); } diff --git a/cli/user-info.php b/cli/user-info.php index a320a4d19..525125758 100755 --- a/cli/user-info.php +++ b/cli/user-info.php @@ -77,7 +77,7 @@ foreach ($users as $username) { 'reads' => (int)$nbEntries['read'], 'unreads' => (int)$nbEntries['unread'], 'favourites' => (int)$nbFavorites['all'], - 'tags' => (int)$tagDAO->count(), + 'tags' => $tagDAO->count(), 'lang' => FreshRSS_Context::$user_conf->language, 'mail_login' => FreshRSS_Context::$user_conf->mail_login, ); |
