From 2baa7a2b9136d4d4dc1e56dfc043cc71da3ee1df Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Fri, 20 Nov 2020 20:52:54 +0100
Subject: Make PHPstan stricter

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 lib/Controller/FeedApiController.php   | 3 +++
 lib/Controller/FeedController.php      | 2 +-
 lib/Controller/FolderApiController.php | 4 ++--
 lib/Controller/FolderController.php    | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/Controller')

diff --git a/lib/Controller/FeedApiController.php b/lib/Controller/FeedApiController.php
index 43d92b7ca..ffea84254 100644
--- a/lib/Controller/FeedApiController.php
+++ b/lib/Controller/FeedApiController.php
@@ -16,6 +16,7 @@
 namespace OCA\News\Controller;
 
 use Exception;
+use OCA\News\Db\Feed;
 use OCA\News\Service\Exceptions\ServiceConflictException;
 use OCA\News\Service\Exceptions\ServiceNotFoundException;
 use OCA\News\Service\FeedServiceV2;
@@ -170,6 +171,7 @@ class FeedApiController extends ApiController
         $folderId = $folderId === 0 ? null : $folderId;
 
         try {
+            /** @var Feed $feed */
             $feed = $this->feedService->find($this->getUserId(), $feedId);
             $feed->setFolderId($folderId);
             $this->feedService->update($this->getUserId(), $feed);
@@ -194,6 +196,7 @@ class FeedApiController extends ApiController
     public function rename(int $feedId, string $feedTitle)
     {
         try {
+            /** @var Feed $feed */
             $feed = $this->feedService->find($this->getUserId(), $feedId);
             $feed->setTitle($feedTitle);
             $this->feedService->update($this->getUserId(), $feed);
diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php
index fd041ea08..9c97d34b1 100644
--- a/lib/Controller/FeedController.php
+++ b/lib/Controller/FeedController.php
@@ -266,7 +266,7 @@ class FeedController extends Controller
             'starred' => count($this->itemService->starred($this->getUserId()))
         ];
 
-        if ($feed) {
+        if (!is_null($feed)) {
             $params['feeds'] = [$feed];
         }
 
diff --git a/lib/Controller/FolderApiController.php b/lib/Controller/FolderApiController.php
index 71fc503e2..ce5d69f2b 100644
--- a/lib/Controller/FolderApiController.php
+++ b/lib/Controller/FolderApiController.php
@@ -91,7 +91,7 @@ class FolderApiController extends ApiController
      */
     public function delete(?int $folderId)
     {
-        if (empty($folderId)) {
+        if (is_null($folderId)) {
             return new JSONResponse([], Http::STATUS_BAD_REQUEST);
         }
 
@@ -117,7 +117,7 @@ class FolderApiController extends ApiController
      */
     public function update(?int $folderId, string $name)
     {
-        if (empty($folderId)) {
+        if (is_null($folderId)) {
             return new JSONResponse([], Http::STATUS_BAD_REQUEST);
         }
 
diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
index da03f9863..9b06b3495 100644
--- a/lib/Controller/FolderController.php
+++ b/lib/Controller/FolderController.php
@@ -104,7 +104,7 @@ class FolderController extends Controller
      */
     public function delete(?int $folderId)
     {
-        if (empty($folderId)) {
+        if (is_null($folderId)) {
             return new JSONResponse([], Http::STATUS_BAD_REQUEST);
         }
         try {
@@ -129,7 +129,7 @@ class FolderController extends Controller
      */
     public function rename(?int $folderId, string $folderName)
     {
-        if (empty($folderId)) {
+        if (is_null($folderId)) {
             return new JSONResponse([], Http::STATUS_BAD_REQUEST);
         }
         try {
-- 
cgit v1.2.3