try fixing missing default context asserts

phpstan · Jun 12, 2024 · f87be07 · f87be07
1 parent 5f097a7
commit f87be07
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -462,7 +462,7 @@ public function specifyTypesInCondition(
 						$parametersAcceptor instanceof ParametersAcceptorWithPhpDocs ? $parametersAcceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
 						TemplateTypeVariance::createInvariant(),
 					));
-					$specifiedTypes = $this->specifyTypesFromAsserts($context, $expr, $asserts, $parametersAcceptor, $scope);
+					$specifiedTypes = $this->specifyTypesFromAsserts($context, $rootExpr, $expr, $asserts, $parametersAcceptor, $scope);
 					if ($specifiedTypes !== null) {
 						return $specifiedTypes;
 					}
@@ -510,7 +510,7 @@ public function specifyTypesInCondition(
 						$parametersAcceptor instanceof ParametersAcceptorWithPhpDocs ? $parametersAcceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
 						TemplateTypeVariance::createInvariant(),
 					));
-					$specifiedTypes = $this->specifyTypesFromAsserts($context, $expr, $asserts, $parametersAcceptor, $scope);
+					$specifiedTypes = $this->specifyTypesFromAsserts($context, $rootExpr, $expr, $asserts, $parametersAcceptor, $scope);
 					if ($specifiedTypes !== null) {
 						return $specifiedTypes;
 					}
@@ -563,7 +563,7 @@ public function specifyTypesInCondition(
 						$parametersAcceptor instanceof ParametersAcceptorWithPhpDocs ? $parametersAcceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
 						TemplateTypeVariance::createInvariant(),
 					));
-					$specifiedTypes = $this->specifyTypesFromAsserts($context, $expr, $asserts, $parametersAcceptor, $scope);
+					$specifiedTypes = $this->specifyTypesFromAsserts($context, $rootExpr, $expr, $asserts, $parametersAcceptor, $scope);
 					if ($specifiedTypes !== null) {
 						return $specifiedTypes;
 					}
@@ -922,7 +922,7 @@ public function specifyTypesInCondition(
 						TemplateTypeVariance::createInvariant(),
 					));
 
-					$specifiedTypes = $this->specifyTypesFromAsserts($context, $expr, $asserts, $parametersAcceptor, $scope);
+					$specifiedTypes = $this->specifyTypesFromAsserts($context, $rootExpr, $expr, $asserts, $parametersAcceptor, $scope);
 
 					if ($specifiedTypes !== null) {
 						return $specifiedTypes;
@@ -1293,7 +1293,7 @@ public function getConditionalSpecifiedTypes(
 		return $specifiedTypes;
 	}
 
-	private function specifyTypesFromAsserts(TypeSpecifierContext $context, Expr\CallLike $call, Assertions $assertions, ParametersAcceptor $parametersAcceptor, Scope $scope): ?SpecifiedTypes
+	private function specifyTypesFromAsserts(TypeSpecifierContext $context, ?Expr $rootExpr, Expr\CallLike $call, Assertions $assertions, ParametersAcceptor $parametersAcceptor, Scope $scope): ?SpecifiedTypes
 	{
 		if ($context->null()) {
 			$asserts = $assertions->getAsserts();
@@ -1334,8 +1334,7 @@ private function specifyTypesFromAsserts(TypeSpecifierContext $context, Expr\Cal
 			$argsMap['this'] = [$call->var];
 		}
 
-		/** @var SpecifiedTypes|null $types */
-		$types = null;
+		$types = $this->handleDefaultTruthyOrFalseyContext($context, $rootExpr, $call, $scope);
 
 		foreach ($asserts as $assert) {
 			foreach ($argsMap[substr($assert->getParameter()->getParameterName(), 1)] ?? [] as $parameterExpr) {
@@ -1378,7 +1377,7 @@ static function (Type $type, callable $traverse) use ($templateTypeMap, &$contai
 					$scope,
 					$containsUnresolvedTemplate || $assert->isEquality() ? $call : null,
 				);
-				$types = $types !== null ? $types->unionWith($newTypes) : $newTypes;
+				$types = $types->unionWith($newTypes);
 
 				if (!$context->null() || !$assertedType instanceof ConstantBooleanType) {
 					continue;