Run high-deps tests with ORM 3 and DBAL 4

derrabus · derrabus · commit 120424abc5da · 2023-10-10T10:42:16.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -46,8 +46,8 @@
         "doctrine/annotations": "^1.10.4|^2",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.7.4",
+        "doctrine/dbal": "^2.13.1|^3|^4",
+        "doctrine/orm": "^2.7.4|^3",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php b/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php
@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\DBAL\ServerVersionProvider;
 
 class DriverWrapper implements Driver
 {
@@ -31,9 +32,9 @@ public function connect(array $params, $username = null, $password = null, array
         return $this->driver->connect($params, $username, $password, $driverOptions);
     }
 
-    public function getDatabasePlatform(): AbstractPlatform
+    public function getDatabasePlatform(ServerVersionProvider $versionProvider = null): AbstractPlatform
     {
-        return $this->driver->getDatabasePlatform();
+        return $this->driver->getDatabasePlatform($versionProvider);
     }
 
     public function getSchemaManager(Connection $conn, AbstractPlatform $platform): AbstractSchemaManager
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -34,7 +34,7 @@
     "require-dev": {
         "cache/integration-tests": "dev-master",
         "doctrine/cache": "^1.6|^2.0",
-        "doctrine/dbal": "^2.13.1|^3.0",
+        "doctrine/dbal": "^2.13.1|^3|^4",
         "predis/predis": "^1.1",
         "psr/simple-cache": "^1.0|^2.0",
         "symfony/config": "^4.4|^5.0|^6.0",
diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
@@ -150,13 +150,22 @@ public function testCreatesTableInTransaction(string $platform)
         $store->save($key);
     }
 
-    public static function providePlatforms()
+    public static function providePlatforms(): \Generator
     {
         yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
-        yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
+
+        // DBAL < 4
+        if (class_exists(\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class)) {
+            yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
+        }
+
         yield [\Doctrine\DBAL\Platforms\SqlitePlatform::class];
         yield [\Doctrine\DBAL\Platforms\SQLServerPlatform::class];
-        yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
+
+        // DBAL < 4
+        if (class_exists(\Doctrine\DBAL\Platforms\SQLServer2012Platform::class)) {
+            yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
+        }
     }
 
     public function testTableCreationInTransactionNotSupported()
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
@@ -22,7 +22,7 @@
         "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/dbal": "^2.13|^3|^4",
         "predis/predis": "~1.0"
     },
     "conflict": {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Doctrine\DBAL\Driver;`
`16`	`16`	`use Doctrine\DBAL\Platforms\AbstractPlatform;`
`17`	`17`	`use Doctrine\DBAL\Schema\AbstractSchemaManager;`
	`18`	`+use Doctrine\DBAL\ServerVersionProvider;`
`18`	`19`
`19`	`20`	`class DriverWrapper implements Driver`
`20`	`21`	`{`
`@@ -31,9 +32,9 @@ public function connect(array $params, $username = null, $password = null, array`
`31`	`32`	`return $this->driver->connect($params, $username, $password, $driverOptions);`
`32`	`33`	`}`
`33`	`34`
`34`		`- public function getDatabasePlatform(): AbstractPlatform`
	`35`	`+ public function getDatabasePlatform(ServerVersionProvider $versionProvider = null): AbstractPlatform`
`35`	`36`	`{`
`36`		`- return $this->driver->getDatabasePlatform();`
	`37`	`+ return $this->driver->getDatabasePlatform($versionProvider);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public function getSchemaManager(Connection $conn, AbstractPlatform $platform): AbstractSchemaManager`