From c8032a00878e539c2fe044cff09c25252c90fa8b Mon Sep 17 00:00:00 2001
From: Brad <28307684+mad-briller@users.noreply.github.com>
Date: Thu, 1 Jun 2023 09:53:32 +0100
Subject: [PATCH] Minor refinements to MutatingScope empty() and typehint
 helper.

---
 src/Analyser/MutatingScope.php |  9 +--------
 src/Type/TypehintHelper.php    | 18 +++++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index 30e78e58b7..53a2829f09 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -725,14 +725,7 @@ private function resolveType(string $exprString, Expr $node): Type
 				}
 
 				if ($isNull->yes()) {
-					if ($isFalsey->yes()) {
-						return false;
-					}
-					if ($isFalsey->no()) {
-						return true;
-					}
-
-					return false;
+					return $isFalsey->no();
 				}
 
 				return !$isFalsey->yes();
diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
index 6277e5aa21..78be1e90b8 100644
--- a/src/Type/TypehintHelper.php
+++ b/src/Type/TypehintHelper.php
@@ -132,22 +132,18 @@ public static function decideTypeFromReflection(
 		}
 
 		$reflectionTypeString = $reflectionType->getName();
-		if (str_ends_with(strtolower($reflectionTypeString), '\\object')) {
+		$loweredReflectionTypeString = strtolower($reflectionTypeString);
+		if (str_ends_with($loweredReflectionTypeString, '\\object')) {
 			$reflectionTypeString = 'object';
-		}
-		if (str_ends_with(strtolower($reflectionTypeString), '\\mixed')) {
+		} elseif (str_ends_with($loweredReflectionTypeString, '\\mixed')) {
 			$reflectionTypeString = 'mixed';
-		}
-		if (str_ends_with(strtolower($reflectionTypeString), '\\true')) {
+		} elseif (str_ends_with($loweredReflectionTypeString, '\\true')) {
 			$reflectionTypeString = 'true';
-		}
-		if (str_ends_with(strtolower($reflectionTypeString), '\\false')) {
+		} elseif (str_ends_with($loweredReflectionTypeString, '\\false')) {
 			$reflectionTypeString = 'false';
-		}
-		if (str_ends_with(strtolower($reflectionTypeString), '\\null')) {
+		} elseif (str_ends_with($loweredReflectionTypeString, '\\null')) {
 			$reflectionTypeString = 'null';
-		}
-		if (str_ends_with(strtolower($reflectionTypeString), '\\never')) {
+		} elseif (str_ends_with($loweredReflectionTypeString, '\\never')) {
 			$reflectionTypeString = 'never';
 		}