From df23d75930ac5508b78c023cab4bed842a7ccd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Thu, 2 Dec 2021 15:38:42 +0100
Subject: [PATCH] Avoid assignment in if clause
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 lib/private/legacy/OC_Image.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index 259d8bc29ffbc..45e8bd88bef02 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -124,11 +124,13 @@ public function mimeType() {
 	 * @return int
 	 */
 	public function width() {
-		if ($this->valid() && (($width = imagesx($this->resource)) !== false)) {
-			return $width;
-		} else {
-			return -1;
+		if ($this->valid()) {
+			$width = imagesx($this->resource);
+			if ($width !== false) {
+				return $width;
+			}
 		}
+		return -1;
 	}
 
 	/**
@@ -137,11 +139,13 @@ public function width() {
 	 * @return int
 	 */
 	public function height() {
-		if ($this->valid() && (($height = imagesy($this->resource)) !== false)) {
-			return $height;
-		} else {
-			return -1;
+		if ($this->valid()) {
+			$height = imagesy($this->resource);
+			if ($height !== false) {
+				return $height;
+			}
 		}
+		return -1;
 	}
 
 	/**