lint

Author: shmax

src/PhpDoc/TypeNodeResolver.php

@@ -105,9 +105,9 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeAlias;
 use PHPStan\Type\TypeAliasResolver;
 use PHPStan\Type\TypeAliasResolverProvider;
-use PHPStan\Type\TypeAlias;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;

src/Type/TypeAlias.php

@@ -15,7 +15,6 @@
 use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
-use PHPStan\Type\TypeTraverser;
 use function array_map;
 use function array_values;
 use function count;
@@ -130,9 +129,10 @@ public function resolveWithDefaults(TypeNodeResolver $typeNodeResolver): Type
 		// Collect default values for params that declare one.
 		$defaultsMap = [];
 		foreach ($this->templateTagValueNodes as $tvn) {
-			if ($tvn->default !== null) {
-				$defaultsMap[$tvn->name] = $typeNodeResolver->resolve($tvn->default, $this->nameScope);
+			if ($tvn->default === null) {
+				continue;
 			}
+			$defaultsMap[$tvn->name] = $typeNodeResolver->resolve($tvn->default, $this->nameScope);
 		}
 
 		if (count($defaultsMap) === 0) {
@@ -170,7 +170,7 @@ private function buildNameScopeWithTemplates(TypeNodeResolver $typeNodeResolver,
 		}
 
 		$className = $nameScope->getClassNameForTypeAlias();
-		$templateTypeScope = ($className !== null && $this->aliasName !== '')
+		$templateTypeScope = $className !== null && $this->aliasName !== ''
 			? TemplateTypeScope::createWithTypeAlias($className, $this->aliasName)
 			: TemplateTypeScope::createWithAnonymousFunction();