Fix tests for ORM 3

Author: ondrejmirtes

tests/DoctrineIntegration/ORM/EntityManagerTypeInferenceTest.php

@@ -14,14 +14,20 @@ class EntityManagerTypeInferenceTest extends TypeInferenceTestCase
 	 */
 	public function dataFileAsserts(): iterable
 	{
+		$ormVersion = InstalledVersions::getVersion('doctrine/orm');
+		$hasOrm2 = $ormVersion !== null && strpos($ormVersion, '2.') === 0;
+		if ($hasOrm2) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManager-orm2.php');
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerMergeReturn.php');
+		}
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerDynamicReturn.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerMergeReturn.php');
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/customRepositoryUsage.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/queryBuilder.php');
 
-		$version = InstalledVersions::getVersion('doctrine/dbal');
-		$hasDbal3 = $version !== null && strpos($version, '3.') === 0;
-		$hasDbal4 = $version !== null && strpos($version, '4.') === 0;
+		$dbalVersion = InstalledVersions::getVersion('doctrine/dbal');
+		$hasDbal3 = $dbalVersion !== null && strpos($dbalVersion, '3.') === 0;
+		$hasDbal4 = $dbalVersion !== null && strpos($dbalVersion, '4.') === 0;
 
 		if ($hasDbal4) {
 			// nothing to test

tests/DoctrineIntegration/ORM/EntityManagerWithoutObjectManagerLoaderTypeInferenceTest.php

@@ -14,8 +14,14 @@ class EntityManagerWithoutObjectManagerLoaderTypeInferenceTest extends TypeInfer
 	 */
 	public function dataFileAsserts(): iterable
 	{
+		$ormVersion = InstalledVersions::getVersion('doctrine/orm');
+		$hasOrm2 = $ormVersion !== null && strpos($ormVersion, '2.') === 0;
+		if ($hasOrm2) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManager-orm2.php');
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerMergeReturn.php');
+		}
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerDynamicReturn.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/entityManagerMergeReturn.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/customRepositoryUsage.php');
 
 		$version = InstalledVersions::getVersion('doctrine/dbal');

tests/DoctrineIntegration/ORM/data/entityManager-orm2.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace PHPStan\DoctrineIntegration\ORM\EntityManagerOrm2;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping as ORM;
+use RuntimeException;
+use function PHPStan\Testing\assertType;
+
+class Example
+{
+	/**
+	 * @var EntityManagerInterface
+	 */
+	private $entityManager;
+
+	public function __construct(EntityManagerInterface $entityManager)
+	{
+		$this->entityManager = $entityManager;
+	}
+
+	public function getPartialReferenceDynamicType(): void
+	{
+		$test = $this->entityManager->getPartialReference(MyEntity::class, 1);
+
+		if ($test === null) {
+			throw new RuntimeException('Sorry, but no...');
+		}
+
+		assertType(MyEntity::class, $test);
+
+		$test->doSomething();
+		$test->doSomethingElse();
+	}
+}
+
+/**
+ * @ORM\Entity()
+ */
+class MyEntity
+{
+	/**
+	 * @ORM\Id()
+	 * @ORM\GeneratedValue()
+	 * @ORM\Column(type="integer")
+	 *
+	 * @var int
+	 */
+	private $id;
+
+	public function doSomething(): void
+	{
+	}
+}

tests/DoctrineIntegration/ORM/data/entityManagerDynamicReturn.php

@@ -45,20 +45,6 @@ public function getReferenceDynamicType(): void
 		$test->doSomethingElse();
 	}
 
-	public function getPartialReferenceDynamicType(): void
-	{
-		$test = $this->entityManager->getPartialReference(MyEntity::class, 1);
-
-		if ($test === null) {
-			throw new RuntimeException('Sorry, but no...');
-		}
-
-		assertType(MyEntity::class, $test);
-
-		$test->doSomething();
-		$test->doSomethingElse();
-	}
-
 	/**
 	 * @param class-string $entityName
 	 */