TypeSpecifier micro-optimization

phpstan · Dec 11, 2022 · 30e6d19 · 30e6d19
1 parent 94c841a
commit 30e6d19
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1498,14 +1498,14 @@ private function createForExpr(
 	{
 		if ($scope !== null) {
 			if ($context->true()) {
-				$resultType = TypeCombinator::intersect($scope->getType($expr), $type);
+				$containsNull = TypeCombinator::containsNull($type) && TypeCombinator::containsNull($scope->getType($expr));
 			} elseif ($context->false()) {
-				$resultType = TypeCombinator::remove($scope->getType($expr), $type);
+				$containsNull = !TypeCombinator::containsNull($type) && TypeCombinator::containsNull($scope->getType($expr));
 			}
 		}
 
 		$originalExpr = $expr;
-		if (isset($resultType) && !TypeCombinator::containsNull($resultType)) {
+		if (isset($containsNull) && !$containsNull) {
 			$expr = NullsafeOperatorHelper::getNullsafeShortcircuitedExpr($expr);
 		}
 
@@ -1554,7 +1554,7 @@ private function createForExpr(
 				|| $methodReflection->hasSideEffects()->yes()
 				|| (!$this->rememberPossiblyImpureFunctionValues && !$methodReflection->hasSideEffects()->no())
 			) {
-				if (isset($resultType) && !TypeCombinator::containsNull($resultType)) {
+				if (isset($containsNull) && !$containsNull) {
 					return $this->createNullsafeTypes($rootExpr, $originalExpr, $scope, $context, $overwrite, $type);
 				}
 
@@ -1580,7 +1580,7 @@ private function createForExpr(
 				|| $methodReflection->hasSideEffects()->yes()
 				|| (!$this->rememberPossiblyImpureFunctionValues && !$methodReflection->hasSideEffects()->no())
 			) {
-				if (isset($resultType) && !TypeCombinator::containsNull($resultType)) {
+				if (isset($containsNull) && !$containsNull) {
 					return $this->createNullsafeTypes($rootExpr, $originalExpr, $scope, $context, $overwrite, $type);
 				}
 
@@ -1605,7 +1605,7 @@ private function createForExpr(
 		}
 
 		$types = new SpecifiedTypes($sureTypes, $sureNotTypes, $overwrite, [], $rootExpr);
-		if ($scope !== null && isset($resultType) && !TypeCombinator::containsNull($resultType)) {
+		if ($scope !== null && isset($containsNull) && !$containsNull) {
 			return $this->createNullsafeTypes($rootExpr, $originalExpr, $scope, $context, $overwrite, $type)->unionWith($types);
 		}