From da0a333b941efecd0dcfe04346ce0241b42345cf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 12 May 2022 22:31:31 +0200
Subject: Refactor OPML export categories (#4356)

* Refactor OPML export categories
Simplify code to comply with types hints.
And renamed a property to plural.

* Link to OPML namespace
---
 app/Models/Category.php | 26 +++++++++++++-------------
 app/Models/View.php     |  1 +
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'app/Models')

diff --git a/app/Models/Category.php b/app/Models/Category.php
index d2968828a..b67818e19 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -6,7 +6,7 @@ class FreshRSS_Category extends Minz_Model {
 	 */
 	private $id = 0;
 	private $name;
-	private $nbFeed = -1;
+	private $nbFeeds = -1;
 	private $nbNotRead = -1;
 	private $feeds = null;
 	private $hasFeedsWithError = false;
@@ -17,10 +17,10 @@ class FreshRSS_Category extends Minz_Model {
 		$this->_name($name);
 		if (isset($feeds)) {
 			$this->_feeds($feeds);
-			$this->nbFeed = 0;
+			$this->nbFeeds = 0;
 			$this->nbNotRead = 0;
 			foreach ($feeds as $feed) {
-				$this->nbFeed++;
+				$this->nbFeeds++;
 				$this->nbNotRead += $feed->nbNotRead();
 				$this->hasFeedsWithError |= $feed->inError();
 			}
@@ -36,13 +36,13 @@ class FreshRSS_Category extends Minz_Model {
 	public function isDefault(): bool {
 		return $this->isDefault;
 	}
-	public function nbFeed(): int {
-		if ($this->nbFeed < 0) {
+	public function nbFeeds(): int {
+		if ($this->nbFeeds < 0) {
 			$catDAO = FreshRSS_Factory::createCategoryDao();
-			$this->nbFeed = $catDAO->countFeed($this->id());
+			$this->nbFeeds = $catDAO->countFeed($this->id());
 		}
 
-		return $this->nbFeed;
+		return $this->nbFeeds;
 	}
 	public function nbNotRead(): int {
 		if ($this->nbNotRead < 0) {
@@ -56,18 +56,18 @@ class FreshRSS_Category extends Minz_Model {
 		if ($this->feeds === null) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
 			$this->feeds = $feedDAO->listByCategory($this->id());
-			$this->nbFeed = 0;
+			$this->nbFeeds = 0;
 			$this->nbNotRead = 0;
 			foreach ($this->feeds as $feed) {
-				$this->nbFeed++;
+				$this->nbFeeds++;
 				$this->nbNotRead += $feed->nbNotRead();
 				$this->hasFeedsWithError |= $feed->inError();
 			}
-		}
 
-		usort($this->feeds, function ($a, $b) {
-			return strnatcasecmp($a->name(), $b->name());
-		});
+			usort($this->feeds, function ($a, $b) {
+				return strnatcasecmp($a->name(), $b->name());
+			});
+		}
 
 		return $this->feeds;
 	}
diff --git a/app/Models/View.php b/app/Models/View.php
index 365bfd261..944bfbea1 100644
--- a/app/Models/View.php
+++ b/app/Models/View.php
@@ -6,6 +6,7 @@ class FreshRSS_View extends Minz_View {
 	public $callbackBeforeEntries;
 	public $callbackBeforeFeeds;
 	public $callbackBeforePagination;
+	/** @var array<FreshRSS_Category> */
 	public $categories;
 	/** @var FreshRSS_Category|null */
 	public $category;
-- 
cgit v1.2.3