Support class-string<T> in ->from

phpstan · Jan 14, 2024 · 7604bc1 · 7604bc1
1 parent 4547795
commit 7604bc1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/Type/Doctrine/ArgumentsProcessor.php b/src/Type/Doctrine/ArgumentsProcessor.php
@@ -47,6 +47,12 @@ public function processArgs(
 				$args[] = $array;
 				continue;
 			}
+
+			if ($value->isClassStringType()->yes() && count($value->getClassStringObjectType()->getObjectClassNames()) === 1) {
+				$args[] = $value->getClassStringObjectType()->getObjectClassNames()[0];
+				continue;
+			}
+
 			if (count($value->getConstantScalarValues()) !== 1) {
 				throw new DynamicQueryBuilderArgumentException();
 			}

diff --git a/tests/Type/Doctrine/data/QueryResult/queryBuilderGetQuery.php b/tests/Type/Doctrine/data/QueryResult/queryBuilderGetQuery.php
@@ -233,4 +233,33 @@ public function testDynamicMethodCall(
 		assertType('mixed', $result);
 	}
 
+
+	/**
+	 * @param class-string<Many> $many
+	 */
+	public function testRegularClassString(EntityManagerInterface $em, string $many)
+	{
+		$result = $em->createQueryBuilder()
+			->select("m")
+			->from($many, 'm')
+			->getQuery()
+			->getResult();
+
+		assertType('list<QueryResult\Entities\Many>', $result);
+	}
+	/**
+	 * @param class-string<T> $many
+	 * @template T of Many
+	 */
+	public function testTemplatedClassString(EntityManagerInterface $em, string $many)
+	{
+		$result = $em->createQueryBuilder()
+			->select("m")
+			->from($many, 'm')
+			->getQuery()
+			->getResult();
+
+		assertType('list<QueryResult\Entities\Many>', $result);
+	}
+
 }