Add int to the between x/y values, and don't treat as a literal-string

Author: craigfrancis

stubs/ORM/Query/Expr.stub

@@ -23,8 +23,8 @@ class Expr
 
 	/**
 	 * @param string $val
-	 * @param string $x
-	 * @param string $y
+	 * @param int|string $x
+	 * @param int|string $y
 	 * @return ($val is literal-string ? ($x is literal-string ? ($y is literal-string ? literal-string&non-empty-string : string) : string) : string)
 	 */
 	public function between($val, $x, $y)

tests/Type/Doctrine/data/QueryResult/expressionBuilderGetQuery.php

@@ -14,6 +14,10 @@ private function nonLiteralString(string $value): string {
 		return $value; // Using the 'string' return type to provide a non `literal-string`, e.g. $_POST['field'];
 	}
 
+	private function nonLiteralInteger(int $value): int {
+		return $value;
+	}
+
 	public function isNullLiteralString(EntityManagerInterface $em): void
 	{
 		$result = $em->createQueryBuilder()->expr()->isNull('field');
@@ -67,6 +71,13 @@ public function betweenNonLiteralString3(EntityManagerInterface $em): void
 		assertType('string', $result);
 	}
 
+	public function betweenNonLiteralString4(EntityManagerInterface $em): void
+	{
+		$value = $this->nonLiteralInteger(2); // Integers are not literal-strings
+		$result = $em->createQueryBuilder()->expr()->between('field', '1', $value);
+		assertType('string', $result);
+	}
+
 	public function countDistinctLiteralString(EntityManagerInterface $em): void
 	{
 		$result = $em->createQueryBuilder()->expr()->countDistinct('A', 'B', 'C');

tests/Type/Doctrine/data/QueryResult/expressionBuilderGetQueryNoObjectManager.php

@@ -67,6 +67,12 @@ public function betweenNonLiteralString3(EntityManagerInterface $em): void
 		assertType('string', $result);
 	}
 
+	public function betweenNonLiteralString4(EntityManagerInterface $em): void
+	{
+		$result = $em->createQueryBuilder()->expr()->between('field', '1', 2); // Integers are not literal-strings
+		assertType('string', $result);
+	}
+
 	public function countDistinctLiteralString(EntityManagerInterface $em): void
 	{
 		$result = $em->createQueryBuilder()->expr()->countDistinct('A', 'B', 'C');