Remove check on getSchemaManager

vincenttouzet · vincenttouzet · commit 58843f3c8c8d · 2019-07-22T13:29:37.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
@@ -15,6 +15,8 @@
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\DBAL\Schema\SchemaConfig;
 use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
@@ -113,6 +115,17 @@ private function getDBALConnectionMock()
         $driverConnection->method('getDatabasePlatform')->willReturn($platform);
         $driverConnection->method('getConfiguration')->willReturn($configuration);
 
+        $schemaManager = $this->getMockBuilder(AbstractSchemaManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaConfig = $this->getMockBuilder(SchemaConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaConfig->method('getMaxIdentifierLength')->willReturn(63);
+        $schemaConfig->method('getDefaultTableOptions')->willReturn([]);
+        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
+        $driverConnection->method('getSchemaManager')->willReturn($schemaManager);
+
         return $driverConnection;
     }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;
 
+use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\DBAL\Schema\SchemaConfig;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\Messenger\Transport\Doctrine\Connection;
@@ -32,19 +34,27 @@ public function testSupports()
 
     public function testCreateTransport()
     {
-        $connection = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
+        $driverConnection = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $schemaManager = $this->getMockBuilder(AbstractSchemaManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaConfig = $this->getMockBuilder(SchemaConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
+        $driverConnection->method('getSchemaManager')->willReturn($schemaManager);
         $registry = $this->getMockBuilder(RegistryInterface::class)->getMock();
         $registry->expects($this->once())
             ->method('getConnection')
-            ->willReturn($connection);
+            ->willReturn($driverConnection);
 
         $factory = new DoctrineTransportFactory($registry);
         $serializer = $this->createMock(SerializerInterface::class);
 
         $this->assertEquals(
-            new DoctrineTransport(new Connection(Connection::buildConfiguration('doctrine://default'), $connection), $serializer),
+            new DoctrineTransport(new Connection(Connection::buildConfiguration('doctrine://default'), $driverConnection), $serializer),
             $factory->createTransport('doctrine://default', [], $serializer)
         );
     }
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -60,7 +60,7 @@ public function __construct(array $configuration, DBALConnection $driverConnecti
         $this->configuration = array_replace_recursive(self::DEFAULT_OPTIONS, $configuration);
         $this->driverConnection = $driverConnection;
         $this->schemaSynchronizer = $schemaSynchronizer ?? new SingleDatabaseSynchronizer($this->driverConnection);
-        $this->schemaConfig = $schemaConfig ?? ($this->driverConnection->getSchemaManager() ? $this->driverConnection->getSchemaManager()->createSchemaConfig() : null);
+        $this->schemaConfig = $schemaConfig ?? $this->driverConnection->getSchemaManager()->createSchemaConfig();
     }
 
     public function getConfiguration(): array

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function __construct(array $configuration, DBALConnection $driverConnecti`
`60`	`60`	`$this->configuration = array_replace_recursive(self::DEFAULT_OPTIONS, $configuration);`
`61`	`61`	`$this->driverConnection = $driverConnection;`
`62`	`62`	`$this->schemaSynchronizer = $schemaSynchronizer ?? new SingleDatabaseSynchronizer($this->driverConnection);`
`63`		`- $this->schemaConfig = $schemaConfig ?? ($this->driverConnection->getSchemaManager() ? $this->driverConnection->getSchemaManager()->createSchemaConfig() : null);`
	`63`	`+ $this->schemaConfig = $schemaConfig ?? $this->driverConnection->getSchemaManager()->createSchemaConfig();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function getConfiguration(): array`