Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2

Phan fixes

3 files changed, 9 insertions, 9 deletions

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 5a3d6309149..cb0ece9fa45 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -173,6 +173,7 @@ class AvatarController extends Controller {
 		if (isset($path)) {
 			$path = stripslashes($path);
 			$userFolder = $this->rootFolder->getUserFolder($this->userId);
+			/** @var File $node */
 			$node = $userFolder->get($path);
 			if (!($node instanceof File)) {
 				return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]);
@@ -296,7 +297,7 @@ class AvatarController extends Controller {
 				Http::STATUS_OK,
 				['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag(crc32($image->data()));
+		$resp->setETag((string)crc32($image->data()));
 		$resp->cacheFor(0);
 		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
 		return $resp;
@@ -328,7 +329,7 @@ class AvatarController extends Controller {
 		}
 
 		$image = new \OC_Image($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], round($crop['w']), round($crop['h']));
+		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
 		try {
 			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);
diff --git a/core/Controller/ContactsMenuController.php b/core/Controller/ContactsMenuController.php
index bbb990f1a4f..76eaf11085d 100644
--- a/core/Controller/ContactsMenuController.php
+++ b/core/Controller/ContactsMenuController.php
@@ -54,7 +54,7 @@ class ContactsMenuController extends Controller {
 	 * @NoAdminRequired
 	 *
 	 * @param string|null filter
-	 * @return JSONResponse
+	 * @return \JsonSerializable[]
 	 */
 	public function index($filter = null) {
 		return $this->manager->getEntries($this->userSession->getUser(), $filter);
@@ -65,15 +65,14 @@ class ContactsMenuController extends Controller {
 	 *
 	 * @param integer $shareType
 	 * @param string $shareWith
-	 * @return JSONResponse
+	 * @return JSONResponse|\JsonSerializable
 	 */
 	public function findOne($shareType, $shareWith) {
 		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
 
 		if ($contact) {
 			return $contact;
-		} else {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
 		}
+		return new JSONResponse([], Http::STATUS_NOT_FOUND);
 	}
 }
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 35eac3a3d8b..ff939f71a4f 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -122,11 +122,11 @@ class OCSController extends \OCP\AppFramework\OCSController {
 				]);
 			}
 
-			$response = new DataResponse(null, 102);
+			$response = new DataResponse([], 102);
 			$response->throttle();
 			return $response;
 		}
-		return new DataResponse(null, 101);
+		return new DataResponse([], 101);
 	}
 
 	/**
@@ -146,6 +146,6 @@ class OCSController extends \OCP\AppFramework\OCSController {
 			return new DataResponse($data);
 		}
 
-		return new DataResponse('User not found', 404);
+		return new DataResponse(['User not found'], 404);
 	}
 }