Revert "Fix variable certainty for ArrayDimFetch in falsey isset cont…

…ext"

This reverts commit 3de3c85.

src/Analyser/EnsuredNonNullabilityResultExpression.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node\Expr;
-use PHPStan\TrinaryLogic;
 use PHPStan\Type\Type;
 
 class EnsuredNonNullabilityResultExpression
@@ -13,7 +12,6 @@ public function __construct(
  private Expr $expression,
  private Type $originalType,
  private Type $originalNativeType,
- private TrinaryLogic $certainty,
  )
  {
  }
@@ -33,9 +31,4 @@ public function getOriginalNativeType(): Type
  return $this->originalNativeType;
  }
 
- public function getCertainty(): TrinaryLogic
- {
- return $this->certainty;
- }
-
 }

src/Analyser/MutatingScope.php

@@ -2341,10 +2341,6 @@ public function isSpecified(Expr $node): bool
  /** @api */
  public function hasExpressionType(Expr $node): TrinaryLogic
  {
- if ($node instanceof Variable && is_string($node->name)) {
- return $this->hasVariableType($node->name);
- }
-
  $exprString = $this->getNodeKey($node);
  if (!isset($this->expressionTypes[$exprString])) {
  return TrinaryLogic::createNo();
@@ -3437,7 +3433,7 @@ public function unsetExpression(Expr $expr): self
  return $scope->invalidateExpression($expr);
  }
 
- public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType, ?TrinaryLogic $certainty = null): self
+ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType): self
  {
  if ($expr instanceof ConstFetch) {
  $loweredConstName = strtolower($expr->name->toString());
@@ -3471,31 +3467,23 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
  if ($dimType instanceof ConstantIntegerType) {
  $types[] = new StringType();
  }
-
  $scope = $scope->specifyExpressionType(
  $expr->var,
  TypeCombinator::intersect(
  TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types)),
  new HasOffsetValueType($dimType, $type),
  ),
  $scope->getNativeType($expr->var),
- $certainty,
  );
  }
  }
  }
 
- if ($certainty === null) {
- $certainty = TrinaryLogic::createYes();
- } elseif ($certainty->no()) {
- throw new ShouldNotHappenException();
- }
-
  $exprString = $this->getNodeKey($expr);
  $expressionTypes = $scope->expressionTypes;
- $expressionTypes[$exprString] = new ExpressionTypeHolder($expr, $type, $certainty);
+ $expressionTypes[$exprString] = ExpressionTypeHolder::createYes($expr, $type);
  $nativeTypes = $scope->nativeExpressionTypes;
- $nativeTypes[$exprString] = new ExpressionTypeHolder($expr, $nativeType, $certainty);
+ $nativeTypes[$exprString] = ExpressionTypeHolder::createYes($expr, $nativeType);
 
  return $this->scopeFactory->create(
  $this->context,

src/Analyser/NodeScopeResolver.php

@@ -1753,22 +1753,14 @@ private function ensureShallowNonNullability(MutatingScope $scope, Scope $origin
  if ($isNull->yes()) {
  return new EnsuredNonNullabilityResult($scope, []);
  }
-
- // keep certainty
- $certainty = TrinaryLogic::createYes();
- $hasExpressionType = $originalScope->hasExpressionType($exprToSpecify);
- if (!$hasExpressionType->no()) {
- $certainty = $hasExpressionType;
- }
-
  $exprTypeWithoutNull = TypeCombinator::removeNull($exprType);
  if ($exprType->equals($exprTypeWithoutNull)) {
  $originalExprType = $originalScope->getType($exprToSpecify);
  if (!$originalExprType->equals($exprTypeWithoutNull)) {
  $originalNativeType = $originalScope->getNativeType($exprToSpecify);
 
  return new EnsuredNonNullabilityResult($scope, [
- new EnsuredNonNullabilityResultExpression($exprToSpecify, $originalExprType, $originalNativeType, $certainty),
+ new EnsuredNonNullabilityResultExpression($exprToSpecify, $originalExprType, $originalNativeType),
  ]);
  }
  return new EnsuredNonNullabilityResult($scope, []);
@@ -1784,7 +1776,7 @@ private function ensureShallowNonNullability(MutatingScope $scope, Scope $origin
  return new EnsuredNonNullabilityResult(
  $scope,
  [
- new EnsuredNonNullabilityResultExpression($exprToSpecify, $exprType, $nativeType, $certainty),
+ new EnsuredNonNullabilityResultExpression($exprToSpecify, $exprType, $nativeType),
  ],
  );
  }
@@ -1814,7 +1806,6 @@ private function revertNonNullability(MutatingScope $scope, array $specifiedExpr
  $specifiedExpressionResult->getExpression(),
  $specifiedExpressionResult->getOriginalType(),
  $specifiedExpressionResult->getOriginalNativeType(),
- $specifiedExpressionResult->getCertainty(),
  );
  }
 

src/Analyser/TypeSpecifier.php

@@ -717,14 +717,11 @@ public function specifyTypesInCondition(
 
  $types = null;
  foreach ($vars as $var) {
- $type = new SpecifiedTypes();
-
  if ($var instanceof Expr\Variable && is_string($var->name)) {
  if ($scope->hasVariableType($var->name)->no()) {
  return new SpecifiedTypes([], [], false, [], $rootExpr);
  }
  }
-
  if (
  $var instanceof ArrayDimFetch
  && $var->dim !== null
@@ -741,32 +738,36 @@ public function specifyTypesInCondition(
  $scope,
  $rootExpr,
  );
+ } else {
+ $type = new SpecifiedTypes();
  }
+
+ $type = $type->unionWith(
+ $this->create($var, new NullType(), TypeSpecifierContext::createFalse(), false, $scope, $rootExpr),
+ );
+ } else {
+ $type = $this->create($var, new NullType(), TypeSpecifierContext::createFalse(), false, $scope, $rootExpr);
  }
 
  if (
  $var instanceof PropertyFetch
  && $var->name instanceof Node\Identifier
  ) {
- $type = $this->create($var->var, new IntersectionType([
+ $type = $type->unionWith($this->create($var->var, new IntersectionType([
  new ObjectWithoutClassType(),
  new HasPropertyType($var->name->toString()),
- ]), TypeSpecifierContext::createTruthy(), false, $scope, $rootExpr);
+ ]), TypeSpecifierContext::createTruthy(), false, $scope, $rootExpr));
  } elseif (
  $var instanceof StaticPropertyFetch
  && $var->class instanceof Expr
  && $var->name instanceof Node\VarLikeIdentifier
  ) {
- $type = $this->create($var->class, new IntersectionType([
+ $type = $type->unionWith($this->create($var->class, new IntersectionType([
  new ObjectWithoutClassType(),
  new HasPropertyType($var->name->toString()),
- ]), TypeSpecifierContext::createTruthy(), false, $scope, $rootExpr);
+ ]), TypeSpecifierContext::createTruthy(), false, $scope, $rootExpr));
  }
 
- $type = $type->unionWith(
- $this->create($var, new NullType(), TypeSpecifierContext::createFalse(), false, $scope, $rootExpr),
- );
-
  if ($types === null) {
  $types = $type;
  } else {
@@ -791,15 +792,6 @@ public function specifyTypesInCondition(
  } elseif (
  $expr instanceof Expr\Empty_
  ) {
- if (!$scope instanceof MutatingScope) {
- throw new ShouldNotHappenException();
- }
-
- $isset = $scope->issetCheck($expr->expr, static fn () => true);
- if ($isset === false) {
- return new SpecifiedTypes();
- }
-
  return $this->specifyTypesInCondition($scope, new BooleanOr(
  new Expr\BooleanNot(new Expr\Isset_([$expr->expr])),
  new Expr\BooleanNot($expr->expr),

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1362,9 +1362,6 @@ public function dataFileAsserts(): iterable
  yield from $this->gatherAssertTypes(__DIR__ . '/data/impure-connection-fns.php');
  yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9963.php');
  yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9995.php');
- yield from $this->gatherAssertTypes(__DIR__ . '/data/falsey-isset-certainty.php');
- yield from $this->gatherAssertTypes(__DIR__ . '/data/falsey-empty-certainty.php');
- yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7291.php');
  }
 
  /**