Minor refinements to MutatingScope empty() and typehint helper.

phpstan · Jun 7, 2023 · c8032a0 · c8032a0
1 parent 32b889d
commit c8032a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git 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
@@ -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';
 		}