Remove @var Type where possible

Author: ondrejmirtes

src/Analyser/TypeSpecifier.php

@@ -182,9 +182,7 @@ public function specifyTypesInCondition(
 		} elseif ($expr instanceof Node\Expr\BinaryOp\Identical) {
 			$expressions = $this->findTypeExpressionsFromBinaryOperation($scope, $expr);
 			if ($expressions !== null) {
-				/** @var Expr $exprNode */
 				$exprNode = $expressions[0];
-				/** @var ConstantScalarType $constantType */
 				$constantType = $expressions[1];
 
 				$specifiedType = $this->specifyTypesForConstantBinaryExpression($exprNode, $constantType, $context, $scope, $rootExpr);
@@ -291,9 +289,7 @@ public function specifyTypesInCondition(
 		} elseif ($expr instanceof Node\Expr\BinaryOp\Equal) {
 			$expressions = $this->findTypeExpressionsFromBinaryOperation($scope, $expr);
 			if ($expressions !== null) {
-				/** @var Expr $exprNode */
 				$exprNode = $expressions[0];
-				/** @var ConstantScalarType $constantType */
 				$constantType = $expressions[1];
 				if (!$context->null() && ($constantType->getValue() === false || $constantType->getValue() === null)) {
 					return $this->specifyTypesInCondition(
@@ -1418,7 +1414,7 @@ private function processBooleanConditionalTypes(Scope $scope, SpecifiedTypes $le
 	}
 
 	/**
-	 * @return (Expr|ConstantScalarType)[]|null
+	 * @return array{Expr, ConstantScalarType}|null
 	 */
 	private function findTypeExpressionsFromBinaryOperation(Scope $scope, Node\Expr\BinaryOp $binaryOperation): ?array
 	{

src/Dependency/DependencyResolver.php

@@ -115,18 +115,19 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 				}
 			}
 		} elseif ($node instanceof Closure || $node instanceof Node\Expr\ArrowFunction) {
-			/** @var ClosureType $closureType */
 			$closureType = $scope->getType($node);
-			foreach ($closureType->getParameters() as $parameter) {
-				$referencedClasses = $parameter->getType()->getReferencedClasses();
-				foreach ($referencedClasses as $referencedClass) {
-					$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+			if ($closureType instanceof ClosureType) {
+				foreach ($closureType->getParameters() as $parameter) {
+					$referencedClasses = $parameter->getType()->getReferencedClasses();
+					foreach ($referencedClasses as $referencedClass) {
+						$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+					}
 				}
-			}
 
-			$returnTypeReferencedClasses = $closureType->getReturnType()->getReferencedClasses();
-			foreach ($returnTypeReferencedClasses as $referencedClass) {
-				$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+				$returnTypeReferencedClasses = $closureType->getReturnType()->getReferencedClasses();
+				foreach ($returnTypeReferencedClasses as $referencedClass) {
+					$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+				}
 			}
 		} elseif ($node instanceof Node\Expr\FuncCall) {
 			$functionName = $node->name;