Better naming classes with PDO - part 1. (#245)

src/CommandPDO.php → src/Command.php

@@ -23,7 +23,7 @@
  * Implements a database command that can be executed with a PDO (PHP Data Object) database connection for SQLite
  * Server.
  */
-final class CommandPDO extends AbstractCommandPDO
+final class Command extends AbstractCommandPDO
 {
     public function insertWithReturningPks(string $table, array $columns): bool|array
     {

src/ConnectionPDO.php → src/Connection.php

@@ -19,7 +19,7 @@
  *
  * @link https://www.php.net/manual/en/ref.pdo-sqlite.php
  */
-final class ConnectionPDO extends AbstractConnectionPDO
+final class Connection extends AbstractConnectionPDO
 {
     /**
      * Reset the connection after cloning.
@@ -36,7 +36,7 @@ public function __clone()
 
     public function createCommand(string $sql = null, array $params = []): CommandPDOInterface
     {
-        $command = new CommandPDO($this);
+        $command = new Command($this);
 
         if ($sql !== null) {
             $command->setSql($sql);
@@ -55,7 +55,7 @@ public function createCommand(string $sql = null, array $params = []): CommandPD
 
     public function createTransaction(): TransactionInterface
     {
-        return new TransactionPDO($this);
+        return new Transaction($this);
     }
 
     public function getQueryBuilder(): QueryBuilderInterface

src/PDODriver.php → src/Driver.php

@@ -12,7 +12,7 @@
  *
  * @link https://www.php.net/manual/en/ref.pdo-sqlite.php
  */
-final class PDODriver extends AbstractPDODriver
+final class Driver extends AbstractPDODriver
 {
     public function createConnection(): PDO
     {

src/Dsn.php

@@ -31,8 +31,8 @@ public function __construct(private string $driver, private string|null $databas
      *
      * ```php
      * $dsn = new Dsn('sqlite', __DIR__ . '/data/test.sq3');
-     * $pdoDriver = new PDODriver($dsn->asString());
-     * $db = new ConnectionPDO($pdoDriver, $schemaCache);
+     * $driver = new Driver($dsn->asString());
+     * $db = new Connection($driver, $schemaCache);
      * ```
      *
      * Will result in the DSN string `sqlite:/path/to/data/test.sq3`.

src/TransactionPDO.php → src/Transaction.php

@@ -13,7 +13,7 @@
 /**
  * Implements the SQLite Server specific transaction.
  */
-final class TransactionPDO extends AbstractTransactionPDO
+final class Transaction extends AbstractTransactionPDO
 {
     /**
      * Sets the isolation level of the current transaction.

tests/CommandPDOTest.php → tests/PdoCommandTest.php

@@ -12,7 +12,7 @@
  *
  * @psalm-suppress PropertyNotSetInConstructor
  */
-final class CommandPDOTest extends CommonCommandPDOTest
+final class PdoCommandTest extends CommonCommandPDOTest
 {
     use TestTrait;
 }

tests/ConnectionPDOTest.php → tests/PdoConnectionTest.php

@@ -18,7 +18,7 @@
  *
  * @psalm-suppress PropertyNotSetInConstructor
  */
-final class ConnectionPDOTest extends CommonConnectionPDOTest
+final class PdoConnectionTest extends CommonConnectionPDOTest
 {
     use TestTrait;
 
@@ -105,7 +105,7 @@ public function testTransactionIsolationException(): void
 
         $this->expectException(NotSupportedException::class);
         $this->expectExceptionMessage(
-            'Yiisoft\Db\Sqlite\TransactionPDO only supports transaction isolation levels READ UNCOMMITTED and SERIALIZABLE.'
+            'Yiisoft\Db\Sqlite\Transaction only supports transaction isolation levels READ UNCOMMITTED and SERIALIZABLE.'
         );
 
         $db->beginTransaction(TransactionInterface::READ_COMMITTED);

tests/Support/TestTrait.php

@@ -7,9 +7,9 @@
 use Yiisoft\Db\Driver\PDO\ConnectionPDOInterface;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidConfigException;
-use Yiisoft\Db\Sqlite\ConnectionPDO;
+use Yiisoft\Db\Sqlite\Connection;
+use Yiisoft\Db\Sqlite\Driver;
 use Yiisoft\Db\Sqlite\Dsn;
-use Yiisoft\Db\Sqlite\PDODriver;
 use Yiisoft\Db\Tests\Support\DbHelper;
 
 trait TestTrait
@@ -22,10 +22,7 @@ trait TestTrait
      */
     protected function getConnection(bool $fixture = false): ConnectionPDOInterface
     {
-        $db = new ConnectionPDO(
-            new PDODriver($this->getDsn()),
-            DbHelper::getSchemaCache()
-        );
+        $db = new Connection(new Driver($this->getDsn()), DbHelper::getSchemaCache());
 
         if ($fixture) {
             DbHelper::loadFixture($db, __DIR__ . '/Fixture/sqlite.sql');