Improve old & new dbal compatibility

Author: janedbal

phpstan.neon

@@ -42,18 +42,22 @@ parameters:
 		-
 			message: '#^Call to function method_exists\(\) with ''Doctrine\\\\ORM\\\\EntityManager'' and ''create'' will always evaluate to true\.$#'
 			path: src/Doctrine/Mapping/ClassMetadataFactory.php
-			reportUnmatched: false
-		-
-			messages:
-				- '#^Call to function method_exists\(\) with Doctrine\\DBAL\\Connection and ''getNativeConnection'' will always evaluate to true\.$#'
-				- '#^Cannot call method getWrappedResourceHandle\(\) on class\-string\|object\.$#'
-			path: tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php
-			reportUnmatched: false
+
 		-
 			message: '#^Call to function method_exists\(\) with Doctrine\\DBAL\\Connection and ''getNativeConnection'' will always evaluate to true\.$#' # needed for older DBAL versions
 			path: src/Type/Doctrine/Query/QueryResultTypeWalker.php
+
 		-
 			messages: # needed for older DBAL versions (fails only on PHP 7.3)
 				- '#^Class Doctrine\\DBAL\\Driver\\PgSQL\\Driver not found\.$#'
 				- '#^Class Doctrine\\DBAL\\Driver\\SQLite3\\Driver not found\.$#'
+
+		-
+			message: '#^Call to an undefined method Doctrine\\DBAL\\Connection\:\:getWrappedConnection\(\)\.$#' # dropped in DBAL 4
 			path: src/Type/Doctrine/Query/QueryResultTypeWalker.php
+
+		-
+			messages: # oldest dbal has only getSchemaManager, dbal4 has only createSchemaManager
+				- '#^Call to function method_exists\(\) with Doctrine\\DBAL\\Connection and ''createSchemaManager'' will always evaluate to true\.$#'
+				- '#^Call to an undefined method Doctrine\\DBAL\\Connection\:\:getSchemaManager\(\)\.$#'
+			path: tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1122,7 +1122,7 @@ public function walkSelectExpression($selectExpression): string
 			if ($expr instanceof TypedExpression) {
 				$type = TypeCombinator::intersect( // e.g. count is typed as int, but we infer int<0, max>
 					$type,
-					$this->resolveDoctrineType(DbalType::lookupName($expr->getReturnType()), null, TypeCombinator::containsNull($type))
+					$this->resolveDoctrineType(DbalType::getTypeRegistry()->lookupName($expr->getReturnType()), null, TypeCombinator::containsNull($type))
 				);
 			} else {
 				// Expressions default to Doctrine's StringType, whose

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -50,6 +50,7 @@
 use function floor;
 use function getenv;
 use function in_array;
+use function method_exists;
 use function reset;
 use function sprintf;
 use function var_export;
@@ -3475,6 +3476,10 @@ private function performDriverTest(
 		callable $assertStringified
 	): void
 	{
+		if (!in_array($driver, DriverManager::getAvailableDrivers(), true)) {
+			return;
+		}
+
 		$connectionParams = [
 			'driver' => $driver,
 			'driverOptions' => self::CONNECTION_CONFIGS[$configName],
@@ -3536,8 +3541,12 @@ private function createConnection(
 	{
 		$connection = DriverManager::getConnection($connectionParams);
 
+		$schemaManager = method_exists($connection, 'createSchemaManager')
+			? $connection->createSchemaManager()
+			: $connection->getSchemaManager();
+
 		if (!isset($connectionParams['dbname'])) {
-			if (!in_array('foo', $connection->createSchemaManager()->listDatabases(), true)) {
+			if (!in_array('foo', $schemaManager->listDatabases(), true)) {
 				$connection->executeQuery('CREATE DATABASE foo');
 			}
 			$connection->executeQuery('USE foo');