Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor usage of MockBuilder's deprecated setMethods() #3664

Merged
merged 2 commits into from
Aug 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/Doctrine/Tests/DBAL/ConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private function getExecuteUpdateMockConnection()
$platform = $this->getMockForAbstractClass(AbstractPlatform::class);

return $this->getMockBuilder(Connection::class)
->setMethods(['executeUpdate'])
->onlyMethods(['executeUpdate'])
->setConstructorArgs([['platform' => $platform], $driverMock])
->getMock();
}
Expand Down Expand Up @@ -145,8 +145,8 @@ public function testGetEventManager() : void

public function testConnectDispatchEvent() : void
{
$listenerMock = $this->getMockBuilder('ConnectDispatchEventListener')
->setMethods(['postConnect'])
$listenerMock = $this->getMockBuilder($this->getMockClass('ConnectDispatchEventListener'))
->addMethods(['postConnect'])
->getMock();
$listenerMock->expects($this->once())->method('postConnect');

Expand Down Expand Up @@ -566,7 +566,7 @@ public function testFetchAssoc() : void

/** @var Connection|MockObject $conn */
$conn = $this->getMockBuilder(Connection::class)
->setMethods(['executeQuery'])
->onlyMethods(['executeQuery'])
->setConstructorArgs([[], $driverMock])
->getMock();

Expand Down Expand Up @@ -602,7 +602,7 @@ public function testFetchArray() : void

/** @var Connection|MockObject $conn */
$conn = $this->getMockBuilder(Connection::class)
->setMethods(['executeQuery'])
->onlyMethods(['executeQuery'])
->setConstructorArgs([[], $driverMock])
->getMock();

Expand Down Expand Up @@ -639,7 +639,7 @@ public function testFetchColumn() : void

/** @var Connection|MockObject $conn */
$conn = $this->getMockBuilder(Connection::class)
->setMethods(['executeQuery'])
->onlyMethods(['executeQuery'])
->setConstructorArgs([[], $driverMock])
->getMock();

Expand Down Expand Up @@ -674,7 +674,7 @@ public function testFetchAll() : void

/** @var Connection|MockObject $conn */
$conn = $this->getMockBuilder(Connection::class)
->setMethods(['executeQuery'])
->onlyMethods(['executeQuery'])
->setConstructorArgs([[], $driverMock])
->getMock();

Expand Down Expand Up @@ -756,7 +756,7 @@ public function testCallConnectOnce(string $method, array $params) : void

$conn = $this->getMockBuilder(Connection::class)
->setConstructorArgs([['pdo' => $pdoMock, 'platform' => $platformMock], $driverMock])
->setMethods(['connect'])
->onlyMethods(['connect'])
->getMock();

$conn->expects($this->once())->method('connect');
Expand Down
4 changes: 2 additions & 2 deletions tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected function setUp() : void
public function testExecute(array $params) : void
{
$statement = $this->getMockBuilder(OCI8Statement::class)
->setMethods(['bindValue', 'errorInfo'])
->onlyMethods(['bindValue', 'errorInfo'])
->disableOriginalConstructor()
->getMock();

Expand Down Expand Up @@ -67,7 +67,7 @@ public function testExecute(array $params) : void
// can't pass to constructor since we don't have a real database handle,
// but execute must check the connection for the executeMode
$conn = $this->getMockBuilder(OCI8Connection::class)
->setMethods(['getExecuteMode'])
->onlyMethods(['getExecuteMode'])
->disableOriginalConstructor()
->getMock();
$conn->expects($this->once())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,10 @@ public function testListTableColumnsDispatchEvent() : void

$this->schemaManager->dropAndCreateTable($table);

$listenerMock = $this
->getMockBuilder('ListTableColumnsDispatchEventListener')
->setMethods(['onSchemaColumnDefinition'])
$listenerMock = $this->getMockBuilder($this->getMockClass('ListTableColumnsDispatchEventListener'))
->addMethods(['onSchemaColumnDefinition'])
->getMock();

$listenerMock
->expects($this->exactly(7))
->method('onSchemaColumnDefinition');
Expand All @@ -395,9 +395,8 @@ public function testListTableIndexesDispatchEvent() : void

$this->schemaManager->dropAndCreateTable($table);

$listenerMock = $this
->getMockBuilder('ListTableIndexesDispatchEventListener')
->setMethods(['onSchemaIndexDefinition'])
$listenerMock = $this->getMockBuilder($this->getMockClass('ListTableIndexesDispatchEventListener'))
->addMethods(['onSchemaIndexDefinition'])
->getMock();
$listenerMock
->expects($this->exactly(3))
Expand Down
12 changes: 6 additions & 6 deletions tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ public function testGetCustomColumnDeclarationSql() : void

public function testGetCreateTableSqlDispatchEvent() : void
{
$listenerMock = $this->getMockBuilder('GetCreateTableSqlDispatchEvenListener')
->setMethods(['onSchemaCreateTable', 'onSchemaCreateTableColumn'])
$listenerMock = $this->getMockBuilder($this->getMockClass('GetCreateTableSqlDispatchEvenListener'))
->addMethods(['onSchemaCreateTable', 'onSchemaCreateTableColumn'])
->getMock();
$listenerMock
->expects($this->once())
Expand All @@ -404,8 +404,8 @@ public function testGetCreateTableSqlDispatchEvent() : void

public function testGetDropTableSqlDispatchEvent() : void
{
$listenerMock = $this->getMockBuilder('GetDropTableSqlDispatchEventListener')
->setMethods(['onSchemaDropTable'])
$listenerMock = $this->getMockBuilder($this->getMockClass('GetDropTableSqlDispatchEventListener'))
->addMethods(['onSchemaDropTable'])
->getMock();
$listenerMock
->expects($this->once())
Expand All @@ -429,8 +429,8 @@ public function testGetAlterTableSqlDispatchEvent() : void
'onSchemaAlterTableRenameColumn',
];

$listenerMock = $this->getMockBuilder('GetAlterTableSqlDispatchEvenListener')
->setMethods($events)
$listenerMock = $this->getMockBuilder($this->getMockClass('GetAlterTableSqlDispatchEvenListener'))
->addMethods($events)
->getMock();
$listenerMock
->expects($this->once())
Expand Down
8 changes: 4 additions & 4 deletions tests/Doctrine/Tests/DBAL/Schema/ComparatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ public function testTablesCaseInsensitive() : void
$c = new Comparator();
$diff = $c->compare($schemaA, $schemaB);

self::assertSchemaTableChangeCount($diff, 1, 0, 1);
$this->assertSchemaTableChangeCount($diff, 1, 0, 1);
}

public function testSequencesCaseInsensitive() : void
Expand All @@ -637,7 +637,7 @@ public function testSequencesCaseInsensitive() : void
$c = new Comparator();
$diff = $c->compare($schemaA, $schemaB);

self::assertSchemaSequenceChangeCount($diff, 1, 0, 1);
$this->assertSchemaSequenceChangeCount($diff, 1, 0, 1);
}

public function testCompareColumnCompareCaseInsensitive() : void
Expand Down Expand Up @@ -1172,10 +1172,10 @@ public function testComparesNamespaces() : void
{
$comparator = new Comparator();
$fromSchema = $this->getMockBuilder(Schema::class)
->setMethods(['getNamespaces', 'hasNamespace'])
->onlyMethods(['getNamespaces', 'hasNamespace'])
->getMock();
$toSchema = $this->getMockBuilder(Schema::class)
->setMethods(['getNamespaces', 'hasNamespace'])
->onlyMethods(['getNamespaces', 'hasNamespace'])
->getMock();

$fromSchema->expects($this->once())
Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/DBAL/Schema/DB2SchemaManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function setUp() : void
$platform = $this->createMock(DB2Platform::class);
$this->conn = $this
->getMockBuilder(Connection::class)
->setMethods(['fetchAll', 'quote'])
->onlyMethods(['fetchAll', 'quote'])
->setConstructorArgs([['platform' => $platform], $driverMock, new Configuration(), $eventManager])
->getMock();
$this->manager = new DB2SchemaManager($this->conn);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected function setUp() : void
$driverMock = $this->createMock(Driver::class);
$platform = $this->createMock(MySqlPlatform::class);
$this->conn = $this->getMockBuilder(Connection::class)
->setMethods(['fetchAll'])
->onlyMethods(['fetchAll'])
->setConstructorArgs([['platform' => $platform], $driverMock, new Configuration(), $eventManager])
->getMock();
$this->manager = new MySqlSchemaManager($this->conn);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected function setUp() : void
parent::setUp();

$this->platformMock = $this->getMockBuilder(AbstractPlatform::class)
->setMethods(
->onlyMethods(
[
'getCreateForeignKeySQL',
'getCreateSchemaSQL',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function testGetQueriesUsesAcceptedForeignKeys() : void
$keyConstraintTwo = $this->getStubKeyConstraint('second');

$platform = $this->getMockBuilder(AbstractPlatform::class)
->setMethods(['getDropForeignKeySQL'])
->onlyMethods(['getDropForeignKeySQL'])
->getMockForAbstractClass();

$collector = new DropSchemaSqlCollector($platform);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SchemaSqlCollectorTest extends TestCase
public function testCreateSchema() : void
{
$platformMock = $this->getMockBuilder(MySqlPlatform::class)
->setMethods(['getCreateTableSql', 'getCreateSequenceSql', 'getCreateForeignKeySql'])
->onlyMethods(['getCreateTableSql', 'getCreateSequenceSql', 'getCreateForeignKeySql'])
->getMock();
$platformMock->expects($this->exactly(2))
->method('getCreateTableSql')
Expand All @@ -33,7 +33,7 @@ public function testCreateSchema() : void
public function testDropSchema() : void
{
$platformMock = $this->getMockBuilder(MySqlPlatform::class)
->setMethods(['getDropTableSql', 'getDropSequenceSql', 'getDropForeignKeySql'])
->onlyMethods(['getDropTableSql', 'getDropSequenceSql', 'getDropForeignKeySql'])
->getMock();
$platformMock->expects($this->exactly(2))
->method('getDropTableSql')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class PoolingShardManagerTest extends TestCase
private function createConnectionMock() : PoolingShardConnection
{
return $this->getMockBuilder(PoolingShardConnection::class)
->setMethods(['connect', 'getParams', 'fetchAll'])
->onlyMethods(['connect', 'getParams', 'fetchAll'])
->disableOriginalConstructor()
->getMock();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function testSelectShard() : void
private function createConnection(array $params) : Connection
{
$conn = $this->getMockBuilder(Connection::class)
->setMethods(['getParams', 'exec', 'isTransactionActive'])
->onlyMethods(['getParams', 'exec', 'isTransactionActive'])
->disableOriginalConstructor()
->getMock();
$conn->expects($this->at(0))->method('getParams')->will($this->returnValue($params));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function testPickShard() : void
private function createConnectionMock() : PoolingShardConnection
{
return $this->getMockBuilder(PoolingShardConnection::class)
->setMethods(['connect', 'getParams', 'fetchAll'])
->onlyMethods(['connect', 'getParams', 'fetchAll'])
->disableOriginalConstructor()
->getMock();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/DBAL/StatementTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class StatementTest extends DbalTestCase
protected function setUp() : void
{
$this->pdoStatement = $this->getMockBuilder(PDOStatement::class)
->setMethods(['execute', 'bindParam', 'bindValue'])
->onlyMethods(['execute', 'bindParam', 'bindValue'])
->getMock();

$driverConnection = $this->createMock(DriverConnection::class);
Expand Down