فهرست منبع

phpstan level 7 for user-info.php (#5309)

* phpstan level 7 for user-info.php

* phpstan level 7 for user-info.php

* phpstan level 7 for user-info.php

---------

Co-authored-by: Luc <sanchezluc+freshrss@gmail.com>
Luc SANCHEZ 3 سال پیش
والد
کامیت
8cc8127c3c
3فایلهای تغییر یافته به همراه20 افزوده شده و 5 حذف شده
  1. 2 2
      app/Models/EntryDAO.php
  2. 18 2
      cli/user-info.php
  3. 0 1
      tests/phpstan-next.txt

+ 2 - 2
app/Models/EntryDAO.php

@@ -1295,8 +1295,8 @@ SQL;
 		}
 		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
 		rsort($res);
-		$all = empty($res[0]) ? 0 : intval($res[0]);
-		$unread = empty($res[1]) ? 0 : intval($res[1]);
+		$all = empty($res[0]) ? 0 : (int)$res[0];
+		$unread = empty($res[1]) ? 0 : (int)$res[1];
 		return array('all' => $all, 'unread' => $unread, 'read' => $all - $unread);
 	}
 

+ 18 - 2
cli/user-info.php

@@ -64,6 +64,21 @@ foreach ($users as $username) {
 	$nbEntries = $entryDAO->countUnreadRead();
 	$nbFavorites = $entryDAO->countUnreadReadFavorites();
 
+	if ($nbFavorites === false) {
+		$nbFavorites = [
+			'all' => 0,
+		];
+	}
+
+	$feedList = $feedDAO->listFeedsIds();
+
+	if ($nbEntries === false) {
+		$nbEntries = [
+			'read' => 0,
+			'unread' => 0,
+		];
+	}
+
 	$data = array(
 		'default' => $username === FreshRSS_Context::$system_conf->default_user ? '*' : '',
 		'user' => $username,
@@ -72,7 +87,7 @@ foreach ($users as $username) {
 		'last_user_activity' => FreshRSS_UserDAO::mtime($username),
 		'database_size' => $databaseDAO->size(),
 		'categories' => $catDAO->count(),
-		'feeds' => count($feedDAO->listFeedsIds()),
+		'feeds' => count($feedList === false ? [] : $feedList),
 		'reads' => (int)$nbEntries['read'],
 		'unreads' => (int)$nbEntries['unread'],
 		'favourites' => (int)$nbFavorites['all'],
@@ -84,11 +99,12 @@ foreach ($users as $username) {
 		$data['last_user_activity'] = date('c', $data['last_user_activity']);
 		$data['database_size'] = format_bytes($data['database_size']);
 	}
+
 	if ($formatJson) {
 		$data['default'] = !empty($data['default']);
 		$data['admin'] = !empty($data['admin']);
 		$data['enabled'] = !empty($data['enabled']);
-		$data['last_user_activity'] = gmdate('Y-m-d\TH:i:s\Z', $data['last_user_activity']);
+		$data['last_user_activity'] = gmdate('Y-m-d\TH:i:s\Z', (int)$data['last_user_activity']);
 		$jsonOutput[] = $data;
 	} else {
 		vprintf(DATA_FORMAT, $data);

+ 0 - 1
tests/phpstan-next.txt

@@ -35,7 +35,6 @@
 ./cli/delete-user.php
 ./cli/do-install.php
 ./cli/manipulate.translation.php
-./cli/user-info.php
 ./lib/lib_date.php
 ./lib/Minz/ActionController.php
 ./lib/Minz/Error.php