aboutsummaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-12-31 17:00:51 +0100
committerGravatar GitHub <noreply@github.com> 2021-12-31 17:00:51 +0100
commit77e9877316fcfacb26799afdf32d94c8411da80e (patch)
tree7fd9c85bf4854054be6536c14d120bc8b790debe /cli
parent09c84fb3bc44bf8e45619c27acc15b967aea14ce (diff)
Add PHPStan (#4021)
* Add PHPStan #fix https://github.com/FreshRSS/FreshRSS/issues/4016 https://phpstan.org/ ```sh composer run-script phpstan ``` * More fixes * Fix global variables * Add .phtml * Fix merge https://github.com/FreshRSS/FreshRSS/pull/4090 * Fix more warnings * Fix view errors and enable in CI * ReturnTypeWillChange * Dynamic view type * Fix Minz static/self bug
Diffstat (limited to 'cli')
-rw-r--r--cli/_update-or-create-user.php6
-rwxr-xr-xcli/create-user.php4
-rwxr-xr-xcli/update-user.php4
-rwxr-xr-xcli/user-info.php2
4 files changed, 9 insertions, 7 deletions
diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php
index 9ccc0dce8..e51c68e10 100644
--- a/cli/_update-or-create-user.php
+++ b/cli/_update-or-create-user.php
@@ -17,11 +17,13 @@ $params = array(
'max_posts_per_rss:',
);
-if (!$isUpdate) {
+if (!isset($isUpdate)) {
+ $isUpdate = false;
+} elseif (!$isUpdate) {
$params[] = 'no_default_feeds'; //Only for creating new users
}
-$options = getopt('', $params);
+$GLOBALS['options'] = getopt('', $params);
if (!validateOptions($argv, $params) || empty($options['user'])) {
fail('Usage: ' . basename($_SERVER['SCRIPT_FILENAME']) .
diff --git a/cli/create-user.php b/cli/create-user.php
index f94a0aa7a..27e27f7a1 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -3,7 +3,7 @@
$isUpdate = false;
require(__DIR__ . '/_update-or-create-user.php');
-$username = $options['user'];
+$username = $GLOBALS['options']['user'];
if (!FreshRSS_user_Controller::checkUsername($username)) {
fail('FreshRSS error: invalid username “' . $username .
'”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN);
@@ -20,7 +20,7 @@ $ok = FreshRSS_user_Controller::createUser(
$username,
empty($options['mail_login']) ? '' : $options['mail_login'],
empty($options['password']) ? '' : $options['password'],
- $values,
+ $GLOBALS['values'],
!isset($options['no_default_feeds'])
);
diff --git a/cli/update-user.php b/cli/update-user.php
index 953a9d2c0..adfc1dbdc 100755
--- a/cli/update-user.php
+++ b/cli/update-user.php
@@ -3,7 +3,7 @@
$isUpdate = true;
require(__DIR__ . '/_update-or-create-user.php');
-$username = cliInitUser($options['user']);
+$username = cliInitUser($GLOBALS['options']['user']);
echo 'FreshRSS updating user “', $username, "”…\n";
@@ -11,7 +11,7 @@ $ok = FreshRSS_user_Controller::updateUser(
$username,
empty($options['mail_login']) ? null : $options['mail_login'],
empty($options['password']) ? '' : $options['password'],
- $values);
+ $GLOBALS['values']);
if (!$ok) {
fail('FreshRSS could not update user!');
diff --git a/cli/user-info.php b/cli/user-info.php
index 582d10431..f338cbc17 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -26,10 +26,10 @@ if (empty($options['user'])) {
sort($users);
$formatJson = isset($options['json']);
+$jsonOutput = [];
if ($formatJson) {
unset($options['header']);
unset($options['h']);
- $jsonOutput = [];
}
if (array_key_exists('header', $options)) {