Cleanup thanks to maybe certainty for variables in root scope

phpstan · Jun 20, 2020 · 7ea7ce4 · 7ea7ce4
1 parent 1567d0f
commit 7ea7ce4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php b/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php
@@ -281,10 +281,6 @@ private function processStmt(Scope $scope, array $varTags, ?Expr $defaultExpr):
 				continue;
 			}
 
-			if ($scope->getFunction() === null && !$scope->isInAnonymousFunction()) {
-				continue;
-			}
-
 			$errors[] = RuleErrorBuilder::message(sprintf('Variable $%s in PHPDoc tag @var does not exist.', $name))->build();
 		}
 

diff --git a/src/Rules/Variables/VariableCertaintyNullCoalesceRule.php b/src/Rules/Variables/VariableCertaintyNullCoalesceRule.php
@@ -53,16 +53,11 @@ public function processNode(Node $node, Scope $scope): array
 
 		$certainty = $scope->hasVariableType($var->name);
 		if ($certainty->no()) {
-			if (
-				$scope->getFunction() !== null
-				|| $scope->isInAnonymousFunction()
-			) {
-				return [RuleErrorBuilder::message(sprintf(
-					'Variable $%s on left side of %s is never defined.',
-					$var->name,
-					$description
-				))->build()];
-			}
+			return [RuleErrorBuilder::message(sprintf(
+				'Variable $%s on left side of %s is never defined.',
+				$var->name,
+				$description
+			))->build()];
 		} elseif ($certainty->yes() && !$isSubNode) {
 			$variableType = $scope->getVariableType($var->name);
 			if ($variableType->isSuperTypeOf(new NullType())->no()) {