Rewrite tests to use TypeInferenceTestCase instead of LevelsTestCase

Author: ondrejmirtes

tests/DoctrineIntegration/ORM/EntityManagerIntegrationTest.php

@@ -0,0 +1,50 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DoctrineIntegration\ORM;
+
+use Composer\InstalledVersions;
+use PHPStan\Testing\TypeInferenceTestCase;
+use function strpos;
+
+class EntityManagerTypeInferenceTest extends TypeInferenceTestCase
+{
+
+	/**
+	 * @return iterable<mixed>
+	 */
+	public function dataFileAsserts(): iterable
+	{
+		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;
+
+		if ($hasDbal3) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/dbalQueryBuilderExecuteDynamicReturnDbal3.php');
+		} else {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/dbalQueryBuilderExecuteDynamicReturn.php');
+		}
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [__DIR__ . '/phpstan.neon'];
+	}
+
+}

tests/DoctrineIntegration/ORM/EntityManagerTypeInferenceTest.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DoctrineIntegration\ORM;
+
+use Composer\InstalledVersions;
+use PHPStan\Testing\TypeInferenceTestCase;
+use function strpos;
+
+class EntityManagerWithoutObjectManagerLoaderTypeInferenceTest extends TypeInferenceTestCase
+{
+
+	/**
+	 * @return iterable<mixed>
+	 */
+	public function dataFileAsserts(): iterable
+	{
+		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');
+		$hasDbal3 = $version !== null && strpos($version, '3.') === 0;
+
+		if ($hasDbal3) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/dbalQueryBuilderExecuteDynamicReturnDbal3.php');
+		} else {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/dbalQueryBuilderExecuteDynamicReturn.php');
+		}
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [__DIR__ . '/phpstan-without-object-manager-loader.neon'];
+	}
+
+}

tests/DoctrineIntegration/ORM/EntityManagerWithoutObjectManagerLoaderIntegrationTest.php

@@ -3,8 +3,6 @@
 namespace PHPStan\DoctrineIntegration\ORM;
 
 use PHPStan\Testing\LevelsTestCase;
-use const PHP_MAJOR_VERSION;
-use const PHP_MINOR_VERSION;
 
 final class EntityRepositoryDynamicReturnIntegrationTest extends LevelsTestCase
 {
@@ -21,10 +19,6 @@ public function dataTopics(): array
 
 	public function getDataPath(): string
 	{
-		if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 1) {
-			return __DIR__ . '/data-php-7.1';
-		}
-
 		return __DIR__ . '/data';
 	}
 

tests/DoctrineIntegration/ORM/EntityManagerWithoutObjectManagerLoaderTypeInferenceTest.php

@@ -3,8 +3,6 @@
 namespace PHPStan\DoctrineIntegration\ORM;
 
 use PHPStan\Testing\LevelsTestCase;
-use const PHP_MAJOR_VERSION;
-use const PHP_MINOR_VERSION;
 
 final class EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTest extends LevelsTestCase
 {
@@ -21,10 +19,6 @@ public function dataTopics(): array
 
 	public function getDataPath(): string
 	{
-		if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 1) {
-			return __DIR__ . '/data-php-7.1';
-		}
-
 		return __DIR__ . '/data';
 	}