Backwards compatibility - remove Type::isNumericString()

ondrejmirtes · ondrejmirtes · commit 4182e3522c4d · 2020-08-26T14:56:07.000+02:00
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -40,6 +40,10 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 			return CompoundTypeHelper::accepts($type, $this, $strictTypes);
 		}
 
+		if (!method_exists($type, 'isNumericString')) {
+			return TrinaryLogic::createNo();
+		}
+
 		return $type->isNumericString();
 	}
 
@@ -49,6 +53,10 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			return TrinaryLogic::createYes();
 		}
 
+		if (!method_exists($type, 'isNumericString')) {
+			return TrinaryLogic::createNo();
+		}
+
 		return $type->isNumericString();
 	}
 
@@ -58,6 +66,10 @@ public function isSubTypeOf(Type $otherType): TrinaryLogic
 			return $otherType->isSuperTypeOf($this);
 		}
 
+		if (!method_exists($otherType, 'isNumericString')) {
+			return TrinaryLogic::createNo();
+		}
+
 		return $otherType->isNumericString()
 			->and($otherType instanceof self ? TrinaryLogic::createYes() : TrinaryLogic::createMaybe());
 	}
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -296,7 +296,11 @@ public static function castToArrayKeyType(Type $offsetType): Type
 				return $offsetType;
 			}
 
-			if ($offsetType instanceof FloatType || $offsetType instanceof BooleanType || $offsetType->isNumericString()->yes()) {
+			if ($offsetType instanceof FloatType || $offsetType instanceof BooleanType) {
+				return new IntegerType();
+			}
+
+			if (method_exists($offsetType, 'isNumericString') && $offsetType->isNumericString()->yes()) {
 				return new IntegerType();
 			}
 
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -277,6 +277,10 @@ public function isArray(): TrinaryLogic
 	public function isNumericString(): TrinaryLogic
 	{
 		return $this->intersectResults(static function (Type $type): TrinaryLogic {
+			if (!method_exists($type, 'isNumericString')) {
+				return TrinaryLogic::createNo();
+			}
+
 			return $type->isNumericString();
 		});
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -85,8 +85,6 @@ public function toString(): Type;
 
 	public function toArray(): Type;
 
-	public function isNumericString(): TrinaryLogic;
-
 	/**
 	 * Infers template types
 	 *
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -365,6 +365,10 @@ public function isArray(): TrinaryLogic
 	public function isNumericString(): TrinaryLogic
 	{
 		return $this->unionResults(static function (Type $type): TrinaryLogic {
+			if (!method_exists($type, 'isNumericString')) {
+				return TrinaryLogic::createNo();
+			}
+
 			return $type->isNumericString();
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic`
`40`	`40`	`return CompoundTypeHelper::accepts($type, $this, $strictTypes);`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ if (!method_exists($type, 'isNumericString')) {`
	`44`	`+ return TrinaryLogic::createNo();`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`return $type->isNumericString();`
`44`	`48`	`}`
`45`	`49`
`@@ -49,6 +53,10 @@ public function isSuperTypeOf(Type $type): TrinaryLogic`
`49`	`53`	`return TrinaryLogic::createYes();`
`50`	`54`	`}`
`51`	`55`
	`56`	`+ if (!method_exists($type, 'isNumericString')) {`
	`57`	`+ return TrinaryLogic::createNo();`
	`58`	`+ }`
	`59`	`+`
`52`	`60`	`return $type->isNumericString();`
`53`	`61`	`}`
`54`	`62`
`@@ -58,6 +66,10 @@ public function isSubTypeOf(Type $otherType): TrinaryLogic`
`58`	`66`	`return $otherType->isSuperTypeOf($this);`
`59`	`67`	`}`
`60`	`68`
	`69`	`+ if (!method_exists($otherType, 'isNumericString')) {`
	`70`	`+ return TrinaryLogic::createNo();`
	`71`	`+ }`
	`72`	`+`
`61`	`73`	`return $otherType->isNumericString()`
`62`	`74`	`->and($otherType instanceof self ? TrinaryLogic::createYes() : TrinaryLogic::createMaybe());`
`63`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,11 @@ public static function castToArrayKeyType(Type $offsetType): Type`
`296`	`296`	`return $offsetType;`
`297`	`297`	`}`
`298`	`298`
`299`		`- if ($offsetType instanceof FloatType \|\| $offsetType instanceof BooleanType \|\| $offsetType->isNumericString()->yes()) {`
	`299`	`+ if ($offsetType instanceof FloatType \|\| $offsetType instanceof BooleanType) {`
	`300`	`+ return new IntegerType();`
	`301`	`+ }`
	`302`	`+`
	`303`	`+ if (method_exists($offsetType, 'isNumericString') && $offsetType->isNumericString()->yes()) {`
`300`	`304`	`return new IntegerType();`
`301`	`305`	`}`
`302`	`306`
Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,10 @@ public function isArray(): TrinaryLogic`
`277`	`277`	`public function isNumericString(): TrinaryLogic`
`278`	`278`	`{`
`279`	`279`	`return $this->intersectResults(static function (Type $type): TrinaryLogic {`
	`280`	`+ if (!method_exists($type, 'isNumericString')) {`
	`281`	`+ return TrinaryLogic::createNo();`
	`282`	`+ }`
	`283`	`+`
`280`	`284`	`return $type->isNumericString();`
`281`	`285`	`});`
`282`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,6 @@ public function toString(): Type;`
`85`	`85`
`86`	`86`	`public function toArray(): Type;`
`87`	`87`
`88`		`- public function isNumericString(): TrinaryLogic;`
`89`		`-`
`90`	`88`	`/**`
`91`	`89`	`* Infers template types`
`92`	`90`	`*`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,10 @@ public function isArray(): TrinaryLogic`
`365`	`365`	`public function isNumericString(): TrinaryLogic`
`366`	`366`	`{`
`367`	`367`	`return $this->unionResults(static function (Type $type): TrinaryLogic {`
	`368`	`+ if (!method_exists($type, 'isNumericString')) {`
	`369`	`+ return TrinaryLogic::createNo();`
	`370`	`+ }`
	`371`	`+`
`368`	`372`	`return $type->isNumericString();`
`369`	`373`	`});`
`370`	`374`	`}`