diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php index 1a4ab5fc4e..e3274f5b89 100644 --- a/src/Analyser/MutatingScope.php +++ b/src/Analyser/MutatingScope.php @@ -37,7 +37,7 @@ use PHPStan\Node\Expr\PropertyInitializationExpr; use PHPStan\Node\Expr\SetOffsetValueTypeExpr; use PHPStan\Node\Expr\TypeExpr; -use PHPStan\Node\NotIssetExpr; +use PHPStan\Node\IssetExpr; use PHPStan\Node\Printer\ExprPrinter; use PHPStan\Parser\ArrayMapArgVisitor; use PHPStan\Parser\NewAssignedToPropertyVisitor; @@ -3823,7 +3823,7 @@ public function filterBySpecifiedTypes(SpecifiedTypes $specifiedTypes): self $expr = $typeSpecification['expr']; $type = $typeSpecification['type']; - if ($expr instanceof NotIssetExpr) { + if ($expr instanceof IssetExpr) { $unsetExpr = $expr->getExpr(); $scope = $scope->unsetExpression($unsetExpr); diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php index a74f98df84..85f6e46c22 100644 --- a/src/Analyser/TypeSpecifier.php +++ b/src/Analyser/TypeSpecifier.php @@ -19,7 +19,7 @@ use PhpParser\Node\Expr\StaticPropertyFetch; use PhpParser\Node\Name; use PHPStan\Node\Expr\AlwaysRememberedExpr; -use PHPStan\Node\NotIssetExpr; +use PHPStan\Node\IssetExpr; use PHPStan\Node\Printer\ExprPrinter; use PHPStan\Reflection\Assertions; use PHPStan\Reflection\ParametersAcceptor; @@ -690,7 +690,7 @@ public function specifyTypesInCondition( if ($isset === true && !TypeCombinator::containsNull($type)) { $specifiedTypes = $specifiedTypes->unionWith($this->create( - new NotIssetExpr($var), + new IssetExpr($var), new NullType(), $context, false, @@ -757,7 +757,7 @@ public function specifyTypesInCondition( $offsetType = $type->getOffsetValueType($dimType); if ($hasOffsetType->yes() && !TypeCombinator::containsNull($offsetType)) { $specifiedTypes = $specifiedTypes->unionWith($this->create( - new NotIssetExpr($var), + new IssetExpr($var), new NullType(), $context, false, diff --git a/src/Node/NotIssetExpr.php b/src/Node/IssetExpr.php similarity index 80% rename from src/Node/NotIssetExpr.php rename to src/Node/IssetExpr.php index ad73e2b70a..5c45df0ebc 100644 --- a/src/Node/NotIssetExpr.php +++ b/src/Node/IssetExpr.php @@ -4,7 +4,7 @@ use PhpParser\Node\Expr; -class NotIssetExpr extends Expr implements VirtualNode +class IssetExpr extends Expr implements VirtualNode { public function __construct( @@ -21,7 +21,7 @@ public function getExpr(): Expr public function getType(): string { - return 'PHPStan_Node_NotIssetExpr'; + return 'PHPStan_Node_IssetExpr'; } /** diff --git a/src/Node/Printer/Printer.php b/src/Node/Printer/Printer.php index 853503df9d..4233c9b4e2 100644 --- a/src/Node/Printer/Printer.php +++ b/src/Node/Printer/Printer.php @@ -11,7 +11,7 @@ use PHPStan\Node\Expr\PropertyInitializationExpr; use PHPStan\Node\Expr\SetOffsetValueTypeExpr; use PHPStan\Node\Expr\TypeExpr; -use PHPStan\Node\NotIssetExpr; +use PHPStan\Node\IssetExpr; use PHPStan\Type\VerbosityLevel; use function sprintf; @@ -58,9 +58,9 @@ protected function pPHPStan_Node_PropertyInitializationExpr(PropertyInitializati return sprintf('__phpstanPropertyInitialization(%s)', $expr->getPropertyName()); } - protected function pPHPStan_Node_NotIssetExpr(NotIssetExpr $expr): string // phpcs:ignore + protected function pPHPStan_Node_IssetExpr(IssetExpr $expr): string // phpcs:ignore { - return sprintf('__phpstanNotIssetExpr(%s)', $this->p($expr->getExpr())); + return sprintf('__phpstanIssetExpr(%s)', $this->p($expr->getExpr())); } }