Get Database platform from connection

alamirault · alamirault · commit a7c3ab1f16c5 · 2022-04-10T18:58:03.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
@@ -45,16 +45,10 @@ public function testCreateTransport()
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
         $schemaManager = $this->createMock(AbstractSchemaManager::class);
         $schemaConfig = $this->createMock(SchemaConfig::class);
-        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
-
         $platform = $this->createMock(AbstractPlatform::class);
-        $driver = $this->createMock(Driver::class);
-        $driver->expects($this->once())
-            ->method('getDatabasePlatform')
-            ->willReturn($platform);
-
+        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
         $driverConnection->method('getSchemaManager')->willReturn($schemaManager);
-        $driverConnection->method('getDriver')->willReturn($driver);
+        $driverConnection->method('getDatabasePlatform')->willReturn($platform);
         $registry = $this->createMock(ConnectionRegistry::class);
 
         $registry->expects($this->once())
@@ -75,16 +69,10 @@ public function testCreateTransportNotifyWithPostgreSQLPlatform()
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
         $schemaManager = $this->createMock(AbstractSchemaManager::class);
         $schemaConfig = $this->createMock(SchemaConfig::class);
-        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
-
         $platform = $this->createMock(PostgreSQLPlatform::class);
-        $driver = $this->createMock(Driver::class);
-        $driver->expects($this->once())
-            ->method('getDatabasePlatform')
-            ->willReturn($platform);
-
+        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
         $driverConnection->method('getSchemaManager')->willReturn($schemaManager);
-        $driverConnection->method('getDriver')->willReturn($driver);
+        $driverConnection->method('getDatabasePlatform')->willReturn($platform);
         $registry = $this->createMock(ConnectionRegistry::class);
 
         $registry->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
@@ -48,7 +48,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
             throw new TransportException(sprintf('Could not find Doctrine connection from Messenger DSN "%s".', $dsn), 0, $e);
         }
 
-        if ($useNotify && $driverConnection->getDriver()->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if ($useNotify && $driverConnection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
             $connection = new PostgreSqlConnection($configuration, $driverConnection);
         } else {
             $connection = new Connection($configuration, $driverConnection);

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface`
`48`	`48`	`throw new TransportException(sprintf('Could not find Doctrine connection from Messenger DSN "%s".', $dsn), 0, $e);`
`49`	`49`	`}`
`50`	`50`
`51`		`- if ($useNotify && $driverConnection->getDriver()->getDatabasePlatform() instanceof PostgreSQLPlatform) {`
	`51`	`+ if ($useNotify && $driverConnection->getDatabasePlatform() instanceof PostgreSQLPlatform) {`
`52`	`52`	`$connection = new PostgreSqlConnection($configuration, $driverConnection);`
`53`	`53`	`} else {`
`54`	`54`	`$connection = new Connection($configuration, $driverConnection);`