bring implementation up to date

Author: jiripudil

src/Analyser/MutatingScope.php

@@ -2539,6 +2539,7 @@ private function createFirstClassCallable(
 				$templateTags[$templateType->getName()] = new TemplateTag(
 					$templateType->getName(),
 					$templateType->getBound(),
+					$templateType->getDefault(),
 					$templateType->getVariance(),
 				);
 			}

src/Dependency/DependencyResolver.php

@@ -531,6 +531,17 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					}
 					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
 				}
+
+				$default = $templateTag->getDefault();
+				if ($default === null) {
+					continue;
+				}
+				foreach ($default->getReferencedClasses() as $referencedClass) {
+					if (!$this->reflectionProvider->hasClass($referencedClass)) {
+						continue;
+					}
+					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+				}
 			}
 
 			foreach ($classReflection->getPropertyTags() as $propertyTag) {

src/PhpDoc/PhpDocNodeResolver.php

@@ -176,6 +176,9 @@ public function resolveMethodTags(PhpDocNode $phpDocNode, NameScope $nameScope):
 							$templateType->bound !== null
 								? $this->typeNodeResolver->resolve($templateType->bound, $nameScope)
 								: new MixedType(),
+							$templateType->default !== null
+								? $this->typeNodeResolver->resolve($templateType->default, $nameScope)
+								: null,
 							TemplateTypeVariance::createInvariant(),
 						);
 					}

src/PhpDoc/TypeNodeResolver.php

@@ -920,6 +920,9 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $
 					$templateType->bound !== null
 						? $this->resolve($templateType->bound, $nameScope)
 						: new MixedType(),
+					$templateType->default !== null
+						? $this->resolve($templateType->default, $nameScope)
+						: null,
 					TemplateTypeVariance::createInvariant(),
 				);
 			}

src/Type/Generic/TemplateObjectShapeType.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Type\ObjectShapeType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
+use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateObjectShapeType extends ObjectShapeType implements TemplateType
@@ -22,6 +23,7 @@ public function __construct(
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
 		ObjectShapeType $bound,
+		?Type $default,
 	)
 	{
 		parent::__construct($bound->getProperties(), $bound->getOptionalProperties());
@@ -30,6 +32,7 @@ public function __construct(
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
 		$this->bound = $bound;
+		$this->default = $default;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

src/Type/Generic/TemplateTypeTrait.php

@@ -176,7 +176,11 @@ public function equals(Type $type): bool
 		return $type instanceof self
 			&& $type->scope->equals($this->scope)
 			&& $type->name === $this->name
-			&& $this->bound->equals($type->bound);
+			&& $this->bound->equals($type->bound)
+			&& (
+				($this->default === null && $type->default === null)
+				|| ($this->default !== null && $type->default !== null && $this->default->equals($type->default))
+			);
 	}
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLogic
@@ -342,6 +346,7 @@ public function traverse(callable $cb): Type
 			$bound,
 			$this->getVariance(),
 			$this->getStrategy(),
+			$default,
 		);
 	}
 
@@ -352,7 +357,9 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		}
 
 		$bound = $cb($this->getBound(), $right->getBound());
-		if ($this->getBound() === $bound) {
+		$default = $this->getDefault() !== null && $right->getDefault() !== null ? $cb($this->getDefault(), $right->getDefault()) : null;
+
+		if ($this->getBound() === $bound && $this->getDefault() === $default) {
 			return $this;
 		}
 
@@ -379,6 +386,7 @@ public function tryRemove(Type $typeToRemove): ?Type
 			$bound,
 			$this->getVariance(),
 			$this->getStrategy(),
+			$this->getDefault(),
 		);
 	}
 

src/Type/TypeCombinator.php

@@ -750,6 +750,7 @@ private static function processArrayTypes(array $arrayTypes): array
 					$templateArray->getVariance(),
 					$templateArray->getName(),
 					$arrayType,
+					$templateArray->getDefault(),
 				);
 			}
 

src/Type/TypeUtils.php

@@ -292,6 +292,7 @@ public static function toStrictUnion(Type $type): Type
 				$type->getVariance(),
 				$type->getName(),
 				static::toStrictUnion($type->getBound()),
+				$type->getDefault(),
 			);
 		}
 

tests/PHPStan/Analyser/data/template-default.php

@@ -60,7 +60,7 @@ function () {
 	assertType('TemplateDefault\\Builder<true, false>', $qb);
 	$qb->two();
 	assertType('TemplateDefault\\Builder<true, true>', $qb);
-	assertType('void', $qb->execute());
+	assertType('null', $qb->execute());
 };
 
 function () {
@@ -70,13 +70,13 @@ function () {
 	assertType('TemplateDefault\\Builder<false, true>', $qb);
 	$qb->one();
 	assertType('TemplateDefault\\Builder<true, true>', $qb);
-	assertType('void', $qb->execute());
+	assertType('null', $qb->execute());
 };
 
 function () {
 	$qb = new Builder();
 	assertType('TemplateDefault\\Builder<false, false>', $qb);
 	$qb->one();
 	assertType('TemplateDefault\\Builder<true, false>', $qb);
-	assertType('*NEVER*', $qb->execute());
+	assertType('never', $qb->execute());
 };