CompoundTypeHelper is deprecated

ondrejmirtes · ondrejmirtes · commit fff85f3c08a3 · 2021-09-11T23:41:18.000+02:00
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -5,7 +5,6 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
@@ -47,7 +46,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 			return TrinaryLogic::createNo();
 		}
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $type->isLiteralString();
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
@@ -44,7 +43,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $type->isNonEmptyString();
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
@@ -44,7 +43,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $type->isNumericString();
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\IntersectionType;
@@ -49,7 +48,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $type->isOffsetAccessible()
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
@@ -40,7 +39,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $type->isArray()
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -66,7 +66,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		if ($type instanceof ConstantArrayType) {
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -71,7 +71,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType && !$type instanceof self) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return $this->isSuperTypeOfInternal($type, true);
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -89,7 +89,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		if (!$type instanceof ClosureType) {
diff --git a/src/Type/CompoundTypeHelper.php b/src/Type/CompoundTypeHelper.php
@@ -4,6 +4,9 @@
 
 use PHPStan\TrinaryLogic;
 
+/**
+ * @deprecated
+ */
 class CompoundTypeHelper
 {
 
diff --git a/src/Type/Generic/TemplateTypeParameterStrategy.php b/src/Type/Generic/TemplateTypeParameterStrategy.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\Type;
 
 /**
@@ -16,7 +15,7 @@ class TemplateTypeParameterStrategy implements TemplateTypeStrategy
 	public function accepts(TemplateType $left, Type $right, bool $strictTypes): TrinaryLogic
 	{
 		if ($right instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($right, $left, $strictTypes);
+			return $right->isAcceptedBy($left, $strictTypes);
 		}
 
 		return $left->getBound()->accepts($right, $strictTypes);
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
@@ -202,7 +202,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createNo();
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -70,7 +70,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createNo();
diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -22,7 +22,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createNo();
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -57,7 +57,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createNo();
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -204,7 +204,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		if ($type instanceof ClosureType) {
diff --git a/src/Type/ObjectWithoutClassType.php b/src/Type/ObjectWithoutClassType.php
@@ -40,7 +40,7 @@ public function getReferencedClasses(): array
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createFromBoolean(
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -110,7 +110,7 @@ public function getBaseClass(): string
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		if (!$type instanceof static) {
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -79,7 +79,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		if ($type instanceof TypeWithClassName && !$strictTypes) {
diff --git a/src/Type/Traits/ConstantScalarTypeTrait.php b/src/Type/Traits/ConstantScalarTypeTrait.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
-use PHPStan\Type\CompoundTypeHelper;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\Type;
@@ -19,7 +18,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		return TrinaryLogic::createNo();
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -85,7 +85,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof CompoundType && !$type instanceof CallableType) {
-			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
+			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
 		$results = [];

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use PHPStan\TrinaryLogic;`
`6`	`6`	`use PHPStan\Type\CompoundType;`
`7`		`-use PHPStan\Type\CompoundTypeHelper;`
`8`	`7`	`use PHPStan\Type\Constant\ConstantArrayType;`
`9`	`8`	`use PHPStan\Type\Constant\ConstantIntegerType;`
`10`	`9`	`use PHPStan\Type\ErrorType;`
`@@ -44,7 +43,7 @@ public function getReferencedClasses(): array`
`44`	`43`	`public function accepts(Type $type, bool $strictTypes): TrinaryLogic`
`45`	`44`	`{`
`46`	`45`	`if ($type instanceof CompoundType) {`
`47`		`- return CompoundTypeHelper::accepts($type, $this, $strictTypes);`
	`46`	`+ return $type->isAcceptedBy($this, $strictTypes);`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`return $type->isNonEmptyString();`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function getReferencedClasses(): array`
`66`	`66`	`public function accepts(Type $type, bool $strictTypes): TrinaryLogic`
`67`	`67`	`{`
`68`	`68`	`if ($type instanceof CompoundType) {`
`69`		`- return CompoundTypeHelper::accepts($type, $this, $strictTypes);`
	`69`	`+ return $type->isAcceptedBy($this, $strictTypes);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if ($type instanceof ConstantArrayType) {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function getReferencedClasses(): array`
`71`	`71`	`public function accepts(Type $type, bool $strictTypes): TrinaryLogic`
`72`	`72`	`{`
`73`	`73`	`if ($type instanceof CompoundType && !$type instanceof self) {`
`74`		`- return CompoundTypeHelper::accepts($type, $this, $strictTypes);`
	`74`	`+ return $type->isAcceptedBy($this, $strictTypes);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return $this->isSuperTypeOfInternal($type, true);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getReferencedClasses(): array`
`89`	`89`	`public function accepts(Type $type, bool $strictTypes): TrinaryLogic`
`90`	`90`	`{`
`91`	`91`	`if ($type instanceof CompoundType) {`
`92`		`- return CompoundTypeHelper::accepts($type, $this, $strictTypes);`
	`92`	`+ return $type->isAcceptedBy($this, $strictTypes);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (!$type instanceof ClosureType) {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`use PHPStan\TrinaryLogic;`
`6`	`6`
	`7`	`+/**`
	`8`	`+ * @deprecated`
	`9`	`+ */`
`7`	`10`	`class CompoundTypeHelper`
`8`	`11`	`{`
`9`	`12`