Simplify TemplateTypeTrait

phpstan · Sep 6, 2022 · 12e40f1 · 12e40f1
1 parent 42f5747
commit 12e40f1
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 315 deletions.
diff --git a/src/Type/Generic/TemplateArrayType.php b/src/Type/Generic/TemplateArrayType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateArrayType extends ArrayType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof ArrayType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateBenevolentUnionType.php b/src/Type/Generic/TemplateBenevolentUnionType.php
@@ -41,20 +41,4 @@ public function withTypes(array $types): self
 		);
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof BenevolentUnionType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 }
diff --git a/src/Type/Generic/TemplateBooleanType.php b/src/Type/Generic/TemplateBooleanType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateBooleanType extends BooleanType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof BooleanType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateConstantArrayType.php b/src/Type/Generic/TemplateConstantArrayType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantArrayType extends ConstantArrayType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof ConstantArrayType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateConstantIntegerType.php b/src/Type/Generic/TemplateConstantIntegerType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantIntegerType extends ConstantIntegerType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof ConstantIntegerType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateConstantStringType.php b/src/Type/Generic/TemplateConstantStringType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateConstantStringType extends ConstantStringType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof ConstantStringType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateFloatType.php b/src/Type/Generic/TemplateFloatType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateFloatType extends FloatType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof FloatType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateGenericObjectType.php b/src/Type/Generic/TemplateGenericObjectType.php
@@ -30,22 +30,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof GenericObjectType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function recreate(string $className, array $types, ?Type $subtractedType): GenericObjectType
 	{
 		return new self(

diff --git a/src/Type/Generic/TemplateIntegerType.php b/src/Type/Generic/TemplateIntegerType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateIntegerType extends IntegerType implements TemplateType
@@ -30,22 +29,6 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof IntegerType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function shouldGeneralizeInferredType(): bool
 	{
 		return false;

diff --git a/src/Type/Generic/TemplateIntersectionType.php b/src/Type/Generic/TemplateIntersectionType.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Generic;
 
 use PHPStan\Type\IntersectionType;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateIntersectionType extends IntersectionType implements TemplateType
@@ -29,20 +28,4 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof IntersectionType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 }
diff --git a/src/Type/Generic/TemplateKeyOfType.php b/src/Type/Generic/TemplateKeyOfType.php
@@ -30,38 +30,17 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof KeyOfType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	protected function getResult(): Type
 	{
 		$result = $this->getBound()->getResult();
 
-		$type = TemplateTypeFactory::create(
+		return TemplateTypeFactory::create(
 			$this->getScope(),
 			$this->getName(),
 			$result,
 			$this->getVariance(),
+			$this->getStrategy(),
 		);
-
-		if ($this->isArgument()) {
-			$type = TemplateTypeHelper::toArgument($type);
-		}
-
-		return $type;
 	}
 
 	protected function shouldGeneralizeInferredType(): bool

diff --git a/src/Type/Generic/TemplateMixedType.php b/src/Type/Generic/TemplateMixedType.php
@@ -45,22 +45,6 @@ public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLog
 		return TrinaryLogic::createYes();
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof MixedType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 	public function toStrictMixedType(): TemplateStrictMixedType
 	{
 		return new TemplateStrictMixedType(

diff --git a/src/Type/Generic/TemplateObjectType.php b/src/Type/Generic/TemplateObjectType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
-use PHPStan\Type\Type;
 
 /** @api */
 final class TemplateObjectType extends ObjectType implements TemplateType
@@ -31,20 +30,4 @@ public function __construct(
 		$this->bound = $bound;
 	}
 
-	public function traverse(callable $cb): Type
-	{
-		$newBound = $cb($this->getBound());
-		if ($this->getBound() !== $newBound && $newBound instanceof ObjectType) {
-			return new self(
-				$this->scope,
-				$this->strategy,
-				$this->variance,
-				$this->name,
-				$newBound,
-			);
-		}
-
-		return $this;
-	}
-
 }