From eb85408c333bc4a93137a5684a344bcba04fee29 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 2 Apr 2018 12:19:43 +0200 Subject: [PATCH] #3074 #2765 Applying CS and adding lacking types wherever holes have been forgotten --- .../DBAL/Driver/Mysqli/MysqliConnection.php | 2 +- .../DBAL/Driver/Mysqli/MysqliStatement.php | 6 +- lib/Doctrine/DBAL/Driver/PDOConnection.php | 2 +- .../DBAL/Functional/LastInsertIdTest.php | 110 +++++++++--------- .../Tests/DBAL/Functional/WriteTest.php | 40 +++---- 5 files changed, 79 insertions(+), 81 deletions(-) diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php index 063b3d1a2fd..f85295471ff 100644 --- a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php +++ b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php @@ -64,7 +64,7 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar * @param string $password * @param array $driverOptions * - * @throws \Doctrine\DBAL\Driver\Mysqli\MysqliException + * @throws MysqliException */ public function __construct(array $params, $username, $password, array $driverOptions = []) { diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php index bebfafbf2d3..246a939a167 100644 --- a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php +++ b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php @@ -103,11 +103,9 @@ class MysqliStatement implements \IteratorAggregate, Statement private $lastInsertId; /** - * @param string $prepareString - * - * @throws \Doctrine\DBAL\Driver\Mysqli\MysqliException + * @throws MysqliException */ - public function __construct(\mysqli $conn, $prepareString, ?LastInsertId $lastInsertId = null) + public function __construct(\mysqli $conn, string $prepareString, ?LastInsertId $lastInsertId = null) { $this->_conn = $conn; $this->_stmt = $conn->prepare($prepareString); diff --git a/lib/Doctrine/DBAL/Driver/PDOConnection.php b/lib/Doctrine/DBAL/Driver/PDOConnection.php index a82175e6e7f..e2270ea6270 100644 --- a/lib/Doctrine/DBAL/Driver/PDOConnection.php +++ b/lib/Doctrine/DBAL/Driver/PDOConnection.php @@ -183,7 +183,7 @@ public function trackLastInsertId() : void * * @return string The last insert ID or '0' in case the last insert ID generated on this connection is unknown. * - * @throws PDOException + * @throws \PDOException */ protected function fetchLastInsertId(?string $sequenceName) : string { diff --git a/tests/Doctrine/Tests/DBAL/Functional/LastInsertIdTest.php b/tests/Doctrine/Tests/DBAL/Functional/LastInsertIdTest.php index 430b93a8192..f563f3e946c 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/LastInsertIdTest.php +++ b/tests/Doctrine/Tests/DBAL/Functional/LastInsertIdTest.php @@ -13,7 +13,7 @@ class LastInsertIdTest extends DbalFunctionalTestCase /** @var Connection */ private $testConnection; - protected function setUp() + protected function setUp() : void { parent::setUp(); @@ -22,7 +22,7 @@ protected function setUp() $this->createTable('last_insert_id_table'); } - protected function tearDown() + protected function tearDown() : void { $this->testConnection->close(); @@ -33,7 +33,7 @@ protected function tearDown() parent::tearDown(); } - private function createTable($tableName) + private function createTable(string $tableName) : void { $table = new Table($tableName); $table->addColumn('id', 'integer', ['autoincrement' => true]); @@ -47,27 +47,27 @@ private function createTable($tableName) $connection->getSchemaManager()->createTable($table); } - public function testLastInsertIdNoInsert() + public function testLastInsertIdNoInsert() : void { $this->assertSame('0', $this->testConnection->lastInsertId()); } - public function testLastInsertIdExec() + public function testLastInsertIdExec() : void { $this->assertLastInsertId($this->createExecInsertExecutor()); } - public function testLastInsertIdPrepare() + public function testLastInsertIdPrepare() : void { $this->assertLastInsertId($this->createPrepareInsertExecutor()); } - public function testLastInsertIdQuery() + public function testLastInsertIdQuery() : void { $this->assertLastInsertId($this->createQueryInsertExecutor()); } - private function assertLastInsertId(callable $insertExecutor) + private function assertLastInsertId(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -78,22 +78,22 @@ private function assertLastInsertId(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterUpdateExec() + public function testLastInsertIdAfterUpdateExec() : void { $this->assertLastInsertIdAfterUpdate($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterUpdatePrepare() + public function testLastInsertIdAfterUpdatePrepare() : void { $this->assertLastInsertIdAfterUpdate($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterUpdateQuery() + public function testLastInsertIdAfterUpdateQuery() : void { $this->assertLastInsertIdAfterUpdate($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterUpdate(callable $insertExecutor) + private function assertLastInsertIdAfterUpdate(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -105,22 +105,22 @@ private function assertLastInsertIdAfterUpdate(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterDeleteExec() + public function testLastInsertIdAfterDeleteExec() : void { $this->assertLastInsertIdAfterDelete($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterDeletePrepare() + public function testLastInsertIdAfterDeletePrepare() : void { $this->assertLastInsertIdAfterDelete($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterDeleteQuery() + public function testLastInsertIdAfterDeleteQuery() : void { $this->assertLastInsertIdAfterDelete($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterDelete(callable $insertExecutor) + private function assertLastInsertIdAfterDelete(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -132,22 +132,22 @@ private function assertLastInsertIdAfterDelete(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterTruncateExec() + public function testLastInsertIdAfterTruncateExec() : void { $this->assertLastInsertIdAfterTruncate($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterTruncatePrepare() + public function testLastInsertIdAfterTruncatePrepare() : void { $this->assertLastInsertIdAfterTruncate($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterTruncateQuery() + public function testLastInsertIdAfterTruncateQuery() : void { $this->assertLastInsertIdAfterTruncate($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterTruncate(callable $insertExecutor) + private function assertLastInsertIdAfterTruncate(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -160,22 +160,22 @@ private function assertLastInsertIdAfterTruncate(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterDropTableExec() + public function testLastInsertIdAfterDropTableExec() : void { $this->assertLastInsertIdAfterDropTable($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterDropTablePrepare() + public function testLastInsertIdAfterDropTablePrepare() : void { $this->assertLastInsertIdAfterDropTable($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterDropTableQuery() + public function testLastInsertIdAfterDropTableQuery() : void { $this->assertLastInsertIdAfterDropTable($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterDropTable(callable $insertExecutor) + private function assertLastInsertIdAfterDropTable(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -189,22 +189,22 @@ private function assertLastInsertIdAfterDropTable(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterSelectExec() + public function testLastInsertIdAfterSelectExec() : void { $this->assertLastInsertIdAfterSelect($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterSelectPrepare() + public function testLastInsertIdAfterSelectPrepare() : void { $this->assertLastInsertIdAfterSelect($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterSelectQuery() + public function testLastInsertIdAfterSelectQuery() : void { $this->assertLastInsertIdAfterSelect($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterSelect(callable $insertExecutor) + private function assertLastInsertIdAfterSelect(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -216,22 +216,22 @@ private function assertLastInsertIdAfterSelect(callable $insertExecutor) $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdInTransactionExec() + public function testLastInsertIdInTransactionExec() : void { $this->assertLastInsertIdInTransaction($this->createExecInsertExecutor()); } - public function testLastInsertIdInTransactionPrepare() + public function testLastInsertIdInTransactionPrepare() : void { $this->assertLastInsertIdInTransaction($this->createPrepareInsertExecutor()); } - public function testLastInsertIdInTransactionQuery() + public function testLastInsertIdInTransactionQuery() : void { $this->assertLastInsertIdInTransaction($this->createQueryInsertExecutor()); } - public function assertLastInsertIdInTransaction(callable $insertExecutor) + public function assertLastInsertIdInTransaction(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -243,22 +243,22 @@ public function assertLastInsertIdInTransaction(callable $insertExecutor) $this->testConnection->rollBack(); } - public function testLastInsertIdAfterTransactionCommitExec() + public function testLastInsertIdAfterTransactionCommitExec() : void { $this->assertLastInsertIdAfterTransactionCommit($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterTransactionCommitPrepare() + public function testLastInsertIdAfterTransactionCommitPrepare() : void { $this->assertLastInsertIdAfterTransactionCommit($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterTransactionCommitQuery() + public function testLastInsertIdAfterTransactionCommitQuery() : void { $this->assertLastInsertIdAfterTransactionCommit($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterTransactionCommit(callable $insertExecutor) + private function assertLastInsertIdAfterTransactionCommit(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -271,22 +271,22 @@ private function assertLastInsertIdAfterTransactionCommit(callable $insertExecut $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdAfterTransactionRollbackExec() + public function testLastInsertIdAfterTransactionRollbackExec() : void { $this->assertLastInsertIdAfterTransactionRollback($this->createExecInsertExecutor()); } - public function testLastInsertIdAfterTransactionRollbackPrepare() + public function testLastInsertIdAfterTransactionRollbackPrepare() : void { $this->assertLastInsertIdAfterTransactionRollback($this->createPrepareInsertExecutor()); } - public function testLastInsertIdAfterTransactionRollbackQuery() + public function testLastInsertIdAfterTransactionRollbackQuery() : void { $this->assertLastInsertIdAfterTransactionRollback($this->createQueryInsertExecutor()); } - private function assertLastInsertIdAfterTransactionRollback(callable $insertExecutor) + private function assertLastInsertIdAfterTransactionRollback(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -299,22 +299,22 @@ private function assertLastInsertIdAfterTransactionRollback(callable $insertExec $this->assertSame('1', $this->testConnection->lastInsertId()); } - public function testLastInsertIdInsertAfterTransactionRollbackExec() + public function testLastInsertIdInsertAfterTransactionRollbackExec() : void { $this->assertLastInsertIdInsertAfterTransactionRollback($this->createExecInsertExecutor()); } - public function testLastInsertIdInsertAfterTransactionRollbackPrepare() + public function testLastInsertIdInsertAfterTransactionRollbackPrepare() : void { $this->assertLastInsertIdInsertAfterTransactionRollback($this->createPrepareInsertExecutor()); } - public function testLastInsertIdInsertAfterTransactionRollbackQuery() + public function testLastInsertIdInsertAfterTransactionRollbackQuery() : void { $this->assertLastInsertIdInsertAfterTransactionRollback($this->createQueryInsertExecutor()); } - private function assertLastInsertIdInsertAfterTransactionRollback(callable $insertExecutor) + private function assertLastInsertIdInsertAfterTransactionRollback(callable $insertExecutor) : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -334,7 +334,7 @@ private function assertLastInsertIdInsertAfterTransactionRollback(callable $inse $this->assertSame($expected, $this->testConnection->lastInsertId()); } - public function testLastInsertIdReusePreparedStatementPrepare() + public function testLastInsertIdReusePreparedStatementPrepare() : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -348,7 +348,7 @@ public function testLastInsertIdReusePreparedStatementPrepare() $this->assertSame('2', $this->testConnection->lastInsertId()); } - public function testLastInsertIdReusePreparedStatementQuery() + public function testLastInsertIdReusePreparedStatementQuery() : void { if (! $this->_conn->getDatabasePlatform()->supportsIdentityColumns()) { $this->markTestSkipped('Test only works on platforms with identity columns.'); @@ -361,7 +361,7 @@ public function testLastInsertIdReusePreparedStatementQuery() $this->assertSame('2', $this->testConnection->lastInsertId()); } - public function testLastInsertIdConnectionScope() + public function testLastInsertIdConnectionScope() : void { $platform = $this->_conn->getDatabasePlatform(); @@ -389,7 +389,7 @@ public function testLastInsertIdConnectionScope() $connection2->close(); } - public function testLastInsertIdSequence() + public function testLastInsertIdSequence() : void { if (! $this->_conn->getDatabasePlatform()->supportsSequences()) { $this->markTestSkipped('Test only works on platforms with sequences.'); @@ -406,22 +406,22 @@ public function testLastInsertIdSequence() $this->assertEquals($lastInsertId, $nextSequenceValue); } - public function testLastInsertIdSequenceEmulatedIdentityColumnExec() + public function testLastInsertIdSequenceEmulatedIdentityColumnExec() : void { $this->assertLastInsertIdSequenceEmulatedIdentityColumn($this->createExecInsertExecutor()); } - public function testLastInsertIdSequenceEmulatedIdentityColumnPrepare() + public function testLastInsertIdSequenceEmulatedIdentityColumnPrepare() : void { $this->assertLastInsertIdSequenceEmulatedIdentityColumn($this->createPrepareInsertExecutor()); } - public function testLastInsertIdSequenceEmulatedIdentityColumnQuery() + public function testLastInsertIdSequenceEmulatedIdentityColumnQuery() : void { $this->assertLastInsertIdSequenceEmulatedIdentityColumn($this->createQueryInsertExecutor()); } - private function assertLastInsertIdSequenceEmulatedIdentityColumn(callable $insertExecutor) + private function assertLastInsertIdSequenceEmulatedIdentityColumn(callable $insertExecutor) : void { $platform = $this->_conn->getDatabasePlatform(); @@ -438,14 +438,14 @@ private function assertLastInsertIdSequenceEmulatedIdentityColumn(callable $inse $this->assertSame('1', $this->_conn->lastInsertId($sequenceName)); } - private function createExecInsertExecutor() + private function createExecInsertExecutor() : callable { return function () { $this->testConnection->getWrappedConnection()->exec('INSERT INTO last_insert_id_table (foo) VALUES (1)'); }; } - private function createPrepareInsertExecutor() + private function createPrepareInsertExecutor() : callable { return function () { $stmt = $this->testConnection->getWrappedConnection()->prepare( @@ -456,7 +456,7 @@ private function createPrepareInsertExecutor() }; } - private function createQueryInsertExecutor() + private function createQueryInsertExecutor() : callable { return function () { $this->testConnection->getWrappedConnection()->query('INSERT INTO last_insert_id_table (foo) VALUES (1)'); diff --git a/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php b/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php index 2a069294cc6..29d5fe51e5c 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php +++ b/tests/Doctrine/Tests/DBAL/Functional/WriteTest.php @@ -9,14 +9,14 @@ class WriteTest extends DbalFunctionalTestCase { - protected function setUp() + protected function setUp() : void { parent::setUp(); $this->createTable('write_table'); } - private function createTable($tableName) + private function createTable(string $tableName) : void { $table = new Table($tableName); $table->addColumn('id', 'integer', ['autoincrement' => true]); @@ -27,7 +27,7 @@ private function createTable($tableName) $this->_conn->getSchemaManager()->createTable($table); } - protected function tearDown() + protected function tearDown() : void { $this->_conn->getSchemaManager()->dropTable('write_table'); @@ -37,7 +37,7 @@ protected function tearDown() /** * @group DBAL-80 */ - public function testExecuteUpdateFirstTypeIsNull() + public function testExecuteUpdateFirstTypeIsNull() : void { $sql = "INSERT INTO write_table (test_string, test_int) VALUES (?, ?)"; $this->_conn->executeUpdate($sql, ['text', 1111], [null, ParameterType::INTEGER]); @@ -46,7 +46,7 @@ public function testExecuteUpdateFirstTypeIsNull() self::assertTrue((bool) $this->_conn->fetchColumn($sql, ['text', 1111])); } - public function testExecuteUpdate() + public function testExecuteUpdate() : void { $sql = "INSERT INTO write_table (test_int) VALUES ( " . $this->_conn->quote(1) . ")"; $affected = $this->_conn->executeUpdate($sql); @@ -54,7 +54,7 @@ public function testExecuteUpdate() self::assertEquals(1, $affected, "executeUpdate() should return the number of affected rows!"); } - public function testExecuteUpdateWithTypes() + public function testExecuteUpdateWithTypes() : void { $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $affected = $this->_conn->executeUpdate( @@ -66,7 +66,7 @@ public function testExecuteUpdateWithTypes() self::assertEquals(1, $affected, "executeUpdate() should return the number of affected rows!"); } - public function testPrepareRowCountReturnsAffectedRows() + public function testPrepareRowCountReturnsAffectedRows() : void { $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $stmt = $this->_conn->prepare($sql); @@ -78,7 +78,7 @@ public function testPrepareRowCountReturnsAffectedRows() self::assertEquals(1, $stmt->rowCount()); } - public function testPrepareWithPdoTypes() + public function testPrepareWithPdoTypes() : void { $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $stmt = $this->_conn->prepare($sql); @@ -90,7 +90,7 @@ public function testPrepareWithPdoTypes() self::assertEquals(1, $stmt->rowCount()); } - public function testPrepareWithDbalTypes() + public function testPrepareWithDbalTypes() : void { $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $stmt = $this->_conn->prepare($sql); @@ -102,7 +102,7 @@ public function testPrepareWithDbalTypes() self::assertEquals(1, $stmt->rowCount()); } - public function testPrepareWithDbalTypeNames() + public function testPrepareWithDbalTypeNames() : void { $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $stmt = $this->_conn->prepare($sql); @@ -114,18 +114,18 @@ public function testPrepareWithDbalTypeNames() self::assertEquals(1, $stmt->rowCount()); } - public function insertRows() + public function insertRows() : void { self::assertEquals(1, $this->_conn->insert('write_table', array('test_int' => 1, 'test_string' => 'foo'))); self::assertEquals(1, $this->_conn->insert('write_table', array('test_int' => 2, 'test_string' => 'bar'))); } - public function testInsert() + public function testInsert() : void { $this->insertRows(); } - public function testDelete() + public function testDelete() : void { $this->insertRows(); @@ -136,7 +136,7 @@ public function testDelete() self::assertCount(0, $this->_conn->fetchAll('SELECT * FROM write_table')); } - public function testUpdate() + public function testUpdate() : void { $this->insertRows(); @@ -148,7 +148,7 @@ public function testUpdate() /** * @group DBAL-445 */ - public function testInsertWithKeyValueTypes() + public function testInsertWithKeyValueTypes() : void { $testString = new \DateTime('2013-04-14 10:10:10'); @@ -166,7 +166,7 @@ public function testInsertWithKeyValueTypes() /** * @group DBAL-445 */ - public function testUpdateWithKeyValueTypes() + public function testUpdateWithKeyValueTypes() : void { $testString = new \DateTime('2013-04-14 10:10:10'); @@ -193,7 +193,7 @@ public function testUpdateWithKeyValueTypes() /** * @group DBAL-445 */ - public function testDeleteWithKeyValueTypes() + public function testDeleteWithKeyValueTypes() : void { $val = new \DateTime('2013-04-14 10:10:10'); $this->_conn->insert( @@ -209,7 +209,7 @@ public function testDeleteWithKeyValueTypes() self::assertFalse($data); } - public function testEmptyIdentityInsert() + public function testEmptyIdentityInsert() : void { $table = new Table('test_empty_identity'); $table->addColumn('id', 'integer', array('autoincrement' => true)); @@ -225,7 +225,7 @@ public function testEmptyIdentityInsert() /** * @group DBAL-2688 */ - public function testUpdateWhereIsNull() + public function testUpdateWhereIsNull() : void { $this->_conn->insert( 'write_table', @@ -244,7 +244,7 @@ public function testUpdateWhereIsNull() self::assertCount(0, $data); } - public function testDeleteWhereIsNull() + public function testDeleteWhereIsNull() : void { $this->_conn->insert( 'write_table',