aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/userController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2023-05-13 22:47:51 +0200
committerGravatar GitHub <noreply@github.com> 2023-05-13 22:47:51 +0200
commitd8c535c25c2330f9c2b7ee19d74b6d2b4a3bf4b6 (patch)
tree45b3ad4f13f051f0061ade5f1d4d3dc90ae7e045 /app/Controllers/userController.php
parent68766a98574d98be358199924222f26d8ac36561 (diff)
PHPStan Level 7 for Share userController logs_pagination (#5393)
Diffstat (limited to 'app/Controllers/userController.php')
-rw-r--r--app/Controllers/userController.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 650f96fb2..f929fc779 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -392,7 +392,10 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
$oldUserDAO = FreshRSS_Factory::createUserDao($username);
$ok &= $oldUserDAO->deleteUser();
$ok &= recursive_unlink($user_data);
- array_map('unlink', glob(PSHB_PATH . '/feeds/*/' . $username . '.txt'));
+ $filenames = glob(PSHB_PATH . '/feeds/*/' . $username . '.txt');
+ if (!empty($filenames)) {
+ array_map('unlink', $filenames);
+ }
}
return (bool)$ok;
}
@@ -628,7 +631,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
$this->view->details = $this->retrieveUserDetails($username);
}
- /** @return array{'feed_count':int|false,'article_count':int|false,'database_size':int,'language':string,'mail_login':string,'enabled':bool,'is_admin':bool,'last_user_activity':string,'is_default':bool} */
+ /** @return array{'feed_count':int,'article_count':int,'database_size':int,'language':string,'mail_login':string,'enabled':bool,'is_admin':bool,'last_user_activity':string,'is_default':bool} */
private function retrieveUserDetails(string $username): array {
$feedDAO = FreshRSS_Factory::createFeedDao($username);
$entryDAO = FreshRSS_Factory::createEntryDao($username);
@@ -636,7 +639,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
$userConfiguration = get_user_configuration($username);
- return array(
+ return [
'feed_count' => $feedDAO->count(),
'article_count' => $entryDAO->count(),
'database_size' => $databaseDAO->size(),
@@ -644,8 +647,8 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {
'mail_login' => $userConfiguration->mail_login,
'enabled' => $userConfiguration->enabled,
'is_admin' => $userConfiguration->is_admin,
- 'last_user_activity' => date('c', FreshRSS_UserDAO::mtime($username)),
+ 'last_user_activity' => date('c', FreshRSS_UserDAO::mtime($username)) ?: '',
'is_default' => FreshRSS_Context::$system_conf->default_user === $username,
- );
+ ];
}
}