Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit58843f3

Browse files
committed
Remove check on getSchemaManager
1 parentb1c2e56 commit58843f3

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

‎src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
useDoctrine\DBAL\Driver\Statement;
1616
useDoctrine\DBAL\Platforms\AbstractPlatform;
1717
useDoctrine\DBAL\Query\QueryBuilder;
18+
useDoctrine\DBAL\Schema\AbstractSchemaManager;
19+
useDoctrine\DBAL\Schema\SchemaConfig;
1820
useDoctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
1921
usePHPUnit\Framework\TestCase;
2022
useSymfony\Component\Messenger\Tests\Fixtures\DummyMessage;
@@ -113,6 +115,17 @@ private function getDBALConnectionMock()
113115
$driverConnection->method('getDatabasePlatform')->willReturn($platform);
114116
$driverConnection->method('getConfiguration')->willReturn($configuration);
115117

118+
$schemaManager =$this->getMockBuilder(AbstractSchemaManager::class)
119+
->disableOriginalConstructor()
120+
->getMock();
121+
$schemaConfig =$this->getMockBuilder(SchemaConfig::class)
122+
->disableOriginalConstructor()
123+
->getMock();
124+
$schemaConfig->method('getMaxIdentifierLength')->willReturn(63);
125+
$schemaConfig->method('getDefaultTableOptions')->willReturn([]);
126+
$schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
127+
$driverConnection->method('getSchemaManager')->willReturn($schemaManager);
128+
116129
return$driverConnection;
117130
}
118131

‎src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespaceSymfony\Component\Messenger\Tests\Transport\Doctrine;
1313

14+
useDoctrine\DBAL\Schema\AbstractSchemaManager;
15+
useDoctrine\DBAL\Schema\SchemaConfig;
1416
usePHPUnit\Framework\TestCase;
1517
useSymfony\Bridge\Doctrine\RegistryInterface;
1618
useSymfony\Component\Messenger\Transport\Doctrine\Connection;
@@ -32,19 +34,27 @@ public function testSupports()
3234

3335
publicfunctiontestCreateTransport()
3436
{
35-
$connection =$this->getMockBuilder(\Doctrine\DBAL\Connection::class)
37+
$driverConnection =$this->getMockBuilder(\Doctrine\DBAL\Connection::class)
3638
->disableOriginalConstructor()
3739
->getMock();
40+
$schemaManager =$this->getMockBuilder(AbstractSchemaManager::class)
41+
->disableOriginalConstructor()
42+
->getMock();
43+
$schemaConfig =$this->getMockBuilder(SchemaConfig::class)
44+
->disableOriginalConstructor()
45+
->getMock();
46+
$schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
47+
$driverConnection->method('getSchemaManager')->willReturn($schemaManager);
3848
$registry =$this->getMockBuilder(RegistryInterface::class)->getMock();
3949
$registry->expects($this->once())
4050
->method('getConnection')
41-
->willReturn($connection);
51+
->willReturn($driverConnection);
4252

4353
$factory =newDoctrineTransportFactory($registry);
4454
$serializer =$this->createMock(SerializerInterface::class);
4555

4656
$this->assertEquals(
47-
newDoctrineTransport(newConnection(Connection::buildConfiguration('doctrine://default'),$connection),$serializer),
57+
newDoctrineTransport(newConnection(Connection::buildConfiguration('doctrine://default'),$driverConnection),$serializer),
4858
$factory->createTransport('doctrine://default', [],$serializer)
4959
);
5060
}

‎src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct(array $configuration, DBALConnection $driverConnecti
6060
$this->configuration =array_replace_recursive(self::DEFAULT_OPTIONS,$configuration);
6161
$this->driverConnection =$driverConnection;
6262
$this->schemaSynchronizer =$schemaSynchronizer ??newSingleDatabaseSynchronizer($this->driverConnection);
63-
$this->schemaConfig =$schemaConfig ??($this->driverConnection->getSchemaManager() ?$this->driverConnection->getSchemaManager()->createSchemaConfig() :null);
63+
$this->schemaConfig =$schemaConfig ??$this->driverConnection->getSchemaManager()->createSchemaConfig();
6464
}
6565

6666
publicfunctiongetConfiguration():array

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp