Merge pull request 'Bump PHPStan to 1.10.3, address some new warnings' (#103) from wn/tt-rss:feature/bump-phpstan into master

Reviewed-on: https://dev.tt-rss.org/tt-rss/tt-rss/pulls/103

1 files changed, 8 insertions, 9 deletions

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index e07fd1d06..b5710ef4f 100755
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -84,15 +84,6 @@ class FeedItem_RSS extends FeedItem_Common {
 		/** @var DOMElement|null */
 		$contentB = $this->elem->getElementsByTagName("description")->item(0);
 
-		if ($contentA && !$contentB) {
-			return $this->subtree_or_text($contentA);
-		}
-
-
-		if ($contentB && !$contentA) {
-			return $this->subtree_or_text($contentB);
-		}
-
 		if ($contentA && $contentB) {
 			$resultA = $this->subtree_or_text($contentA);
 			$resultB = $this->subtree_or_text($contentB);
@@ -100,6 +91,14 @@ class FeedItem_RSS extends FeedItem_Common {
 			return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
 		}
 
+		if ($contentA) {
+			return $this->subtree_or_text($contentA);
+		}
+
+		if ($contentB) {
+			return $this->subtree_or_text($contentB);
+		}
+
 		return '';
 	}