Template types aren't subtractable

phpstan · May 6, 2020 · 0a1e2d3 · 0a1e2d3
1 parent cc1c23e
commit 0a1e2d3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 95 deletions.
diff --git a/src/Type/Generic/TemplateMixedType.php b/src/Type/Generic/TemplateMixedType.php
@@ -6,9 +6,7 @@
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -35,11 +33,10 @@ public function __construct(
 		TemplateTypeScope $scope,
 		TemplateTypeStrategy $templateTypeStrategy,
 		TemplateTypeVariance $templateTypeVariance,
-		string $name,
-		?Type $subtractedType = null
+		string $name
 	)
 	{
-		parent::__construct(true, $subtractedType);
+		parent::__construct(true);
 
 		$this->scope = $scope;
 		$this->strategy = $templateTypeStrategy;
@@ -82,7 +79,7 @@ public function equals(Type $type): bool
 	public function getBound(): Type
 	{
 		if ($this->bound === null) {
-			$this->bound = new MixedType(true, $this->getSubtractedType());
+			$this->bound = new MixedType(true);
 		}
 		return $this->bound;
 	}
@@ -172,8 +169,7 @@ public function toArgument(): TemplateType
 			$this->scope,
 			new TemplateTypeArgumentStrategy(),
 			$this->variance,
-			$this->name,
-			$this->getSubtractedType()
+			$this->name
 		);
 	}
 
@@ -184,42 +180,17 @@ public function isValidVariance(Type $a, Type $b): bool
 
 	public function subtract(Type $type): Type
 	{
-		if ($type instanceof self) {
-			return new NeverType();
-		}
-		if ($this->getSubtractedType() !== null) {
-			$type = TypeCombinator::union($this->getSubtractedType(), $type);
-		}
-
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			$type
-		);
+		return $this;
 	}
 
 	public function getTypeWithoutSubtractedType(): Type
 	{
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			null
-		);
+		return $this;
 	}
 
 	public function changeSubtractedType(?Type $subtractedType): Type
 	{
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			$subtractedType
-		);
+		return $this;
 	}
 
 	public function getVariance(): TemplateTypeVariance
@@ -237,8 +208,7 @@ public static function __set_state(array $properties): Type
 			$properties['scope'],
 			$properties['strategy'],
 			$properties['variance'],
-			$properties['name'],
-			$properties['subtractedType']
+			$properties['name']
 		);
 	}
 

diff --git a/src/Type/Generic/TemplateObjectType.php b/src/Type/Generic/TemplateObjectType.php
@@ -35,17 +35,16 @@ public function __construct(
 		TemplateTypeStrategy $templateTypeStrategy,
 		TemplateTypeVariance $templateTypeVariance,
 		string $name,
-		string $class,
-		?Type $subtractedType = null
+		string $class
 	)
 	{
-		parent::__construct($class, $subtractedType);
+		parent::__construct($class);
 
 		$this->scope = $scope;
 		$this->strategy = $templateTypeStrategy;
 		$this->variance = $templateTypeVariance;
 		$this->name = $name;
-		$this->bound = new ObjectType($class, $subtractedType);
+		$this->bound = new ObjectType($class);
 	}
 
 	public function getName(): string
@@ -179,8 +178,7 @@ public function toArgument(): TemplateType
 			new TemplateTypeArgumentStrategy(),
 			TemplateTypeVariance::createInvariant(),
 			$this->name,
-			$this->getClassName(),
-			$this->getSubtractedType()
+			$this->getClassName()
 		);
 	}
 
@@ -189,16 +187,19 @@ public function isValidVariance(Type $a, Type $b): bool
 		return $this->variance->isValidVariance($a, $b);
 	}
 
+	public function subtract(Type $type): Type
+	{
+		return $this;
+	}
+
+	public function getTypeWithoutSubtractedType(): Type
+	{
+		return $this;
+	}
+
 	public function changeSubtractedType(?Type $subtractedType): Type
 	{
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			$this->getClassName(),
-			$subtractedType
-		);
+		return $this;
 	}
 
 	public function getVariance(): TemplateTypeVariance
@@ -217,8 +218,7 @@ public static function __set_state(array $properties): Type
 			$properties['strategy'],
 			$properties['variance'],
 			$properties['name'],
-			$properties['className'],
-			$properties['subtractedType']
+			$properties['className']
 		);
 	}
 

diff --git a/src/Type/Generic/TemplateObjectWithoutClassType.php b/src/Type/Generic/TemplateObjectWithoutClassType.php
@@ -5,10 +5,8 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\IntersectionType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -35,11 +33,10 @@ public function __construct(
 		TemplateTypeScope $scope,
 		TemplateTypeStrategy $templateTypeStrategy,
 		TemplateTypeVariance $templateTypeVariance,
-		string $name,
-		?Type $subtractedType = null
+		string $name
 	)
 	{
-		parent::__construct($subtractedType);
+		parent::__construct();
 
 		$this->scope = $scope;
 		$this->strategy = $templateTypeStrategy;
@@ -60,7 +57,7 @@ public function getScope(): TemplateTypeScope
 	public function getBound(): Type
 	{
 		if ($this->bound === null) {
-			$this->bound = new ObjectWithoutClassType($this->getSubtractedType());
+			$this->bound = new ObjectWithoutClassType();
 		}
 		return $this->bound;
 	}
@@ -95,8 +92,7 @@ public function toArgument(): TemplateType
 			$this->scope,
 			new TemplateTypeArgumentStrategy(),
 			$this->variance,
-			$this->name,
-			$this->getSubtractedType()
+			$this->name
 		);
 	}
 
@@ -105,44 +101,19 @@ public function isValidVariance(Type $a, Type $b): bool
 		return $this->variance->isValidVariance($a, $b);
 	}
 
-	public function getTypeWithoutSubtractedType(): Type
+	public function subtract(Type $type): Type
 	{
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			null
-		);
+		return $this;
 	}
 
-	public function subtract(Type $type): Type
+	public function getTypeWithoutSubtractedType(): Type
 	{
-		if ($type instanceof self) {
-			return new NeverType();
-		}
-		if ($this->getSubtractedType() !== null) {
-			$type = TypeCombinator::union($this->getSubtractedType(), $type);
-		}
-
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			$type
-		);
+		return $this;
 	}
 
 	public function changeSubtractedType(?Type $subtractedType): Type
 	{
-		return new self(
-			$this->scope,
-			$this->strategy,
-			$this->variance,
-			$this->name,
-			$subtractedType
-		);
+		return $this;
 	}
 
 	public function equals(Type $type): bool
@@ -241,8 +212,7 @@ public static function __set_state(array $properties): Type
 			$properties['scope'],
 			$properties['strategy'],
 			$properties['variance'],
-			$properties['name'],
-			$properties['subtractedType']
+			$properties['name']
 		);
 	}
 

diff --git a/tests/PHPStan/Analyser/data/generics.php b/tests/PHPStan/Analyser/data/generics.php
@@ -1083,7 +1083,7 @@ function testGenericObjectWithoutClassType2($a)
 		return $a;
 	}
 
-	assertType('T of object~stdClass (function PHPStan\Generics\FunctionsAssertType\testGenericObjectWithoutClassType2(), argument)', $b);
+	assertType('T of object (function PHPStan\Generics\FunctionsAssertType\testGenericObjectWithoutClassType2(), argument)', $b);
 
 	return $a;
 }