[BCB] Type generalization precision is now a required argument

phpstan · Sep 23, 2021 · 6568103 · 6568103
1 parent 4e7d60d
commit 6568103
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1118,7 +1118,7 @@ private function resolveType(Expr $node): Type
 					foreach ($rightTypes as $rightType) {
 						$resultType = $this->calculateFromScalars($node, $leftType, $rightType);
 						if ($generalize) {
-							$resultType = TypeUtils::generalizeType($resultType);
+							$resultType = TypeUtils::generalizeType($resultType, GeneralizePrecision::lessSpecific());
 						}
 						$resultTypes[] = $resultType;
 					}

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -619,7 +619,7 @@ public function toFloat(): Type
 		return $this->toBoolean()->toFloat();
 	}
 
-	public function generalize(?GeneralizePrecision $precision = null): Type
+	public function generalize(GeneralizePrecision $precision): Type
 	{
 		if (count($this->keyTypes) === 0) {
 			return $this;

diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -301,25 +301,25 @@ public function append(self $otherString): self
 		return new self($this->getValue() . $otherString->getValue());
 	}
 
-	public function generalize(?GeneralizePrecision $precision = null): Type
+	public function generalize(GeneralizePrecision $precision): Type
 	{
 		if ($this->isClassString) {
-			if ($precision !== null && $precision->isMoreSpecific()) {
+			if ($precision->isMoreSpecific()) {
 				return new ClassStringType();
 			}
 
 			return new StringType();
 		}
 
-		if ($this->getValue() !== '' && $precision !== null && $precision->isMoreSpecific()) {
+		if ($this->getValue() !== '' && $precision->isMoreSpecific()) {
 			return new IntersectionType([
 				new StringType(),
 				new AccessoryNonEmptyStringType(),
 				new AccessoryLiteralStringType(),
 			]);
 		}
 
-		if ($precision !== null && $precision->isMoreSpecific()) {
+		if ($precision->isMoreSpecific()) {
 			return new IntersectionType([
 				new StringType(),
 				new AccessoryLiteralStringType(),

diff --git a/src/Type/ConstantType.php b/src/Type/ConstantType.php
@@ -6,6 +6,6 @@
 interface ConstantType extends Type
 {
 
-	public function generalize(?GeneralizePrecision $precision = null): Type;
+	public function generalize(GeneralizePrecision $precision): Type;
 
 }
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
@@ -269,7 +269,7 @@ public function equals(Type $type): bool
 	}
 
 
-	public function generalize(?GeneralizePrecision $precision = null): Type
+	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new parent();
 	}

diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -45,7 +45,7 @@ public function getValue()
 		return null;
 	}
 
-	public function generalize(?GeneralizePrecision $precision = null): Type
+	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return $this;
 	}

diff --git a/src/Type/Traits/ConstantScalarTypeTrait.php b/src/Type/Traits/ConstantScalarTypeTrait.php
@@ -72,7 +72,7 @@ public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function generalize(?GeneralizePrecision $precision = null): Type
+	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new parent();
 	}

diff --git a/src/Type/TypeUtils.php b/src/Type/TypeUtils.php
@@ -119,7 +119,7 @@ public static function getAnyArrays(Type $type): array
 		return self::map(ArrayType::class, $type, true, false);
 	}
 
-	public static function generalizeType(Type $type, ?GeneralizePrecision $precision = null): Type
+	public static function generalizeType(Type $type, GeneralizePrecision $precision): Type
 	{
 		return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($precision): Type {
 			if ($type instanceof ConstantType) {