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

yiisoft · Apr 5, 2023 · abf1eca · abf1eca
1 parent d70a5d3
commit abf1eca
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/CommandPDO.php → src/Command.php b/src/CommandPDO.php → src/Command.php
@@ -23,7 +23,7 @@
  * Implements a database command that can be executed against a PDO (PHP Data Object) database connection for Oracle
  * Server.
  */
-final class CommandPDO extends AbstractCommandPDO
+final class Command extends AbstractCommandPDO
 {
     public function insertWithReturningPks(string $table, array $columns): bool|array
     {

diff --git a/src/ConnectionPDO.php → src/Connection.php b/src/ConnectionPDO.php → src/Connection.php
@@ -21,11 +21,11 @@
  *
  * @link https://www.php.net/manual/en/ref.pdo-oci.php
  */
-final class ConnectionPDO extends AbstractConnectionPDO
+final class Connection extends AbstractConnectionPDO
 {
     public function createCommand(string $sql = null, array $params = []): CommandPDOInterface
     {
-        $command = new CommandPDO($this);
+        $command = new Command($this);
 
         if ($sql !== null) {
             $command->setSql($sql);
@@ -44,7 +44,7 @@ public function createCommand(string $sql = null, array $params = []): CommandPD
 
     public function createTransaction(): TransactionInterface
     {
-        return new TransactionPDO($this);
+        return new Transaction($this);
     }
 
     /**

diff --git a/src/PDODriver.php → src/Driver.php b/src/PDODriver.php → src/Driver.php
@@ -12,7 +12,7 @@
  *
  * @see https://www.php.net/manual/en/ref.pdo-oci.php
  */
-final class PDODriver extends AbstractPDODriver
+final class Driver extends AbstractPDODriver
 {
     public function createConnection(): PDO
     {

diff --git a/src/TransactionPDO.php → src/Transaction.php b/src/TransactionPDO.php → src/Transaction.php
@@ -9,7 +9,7 @@
 /**
  * Implements the Oracle Server specific transaction.
  */
-final class TransactionPDO extends AbstractTransactionPDO
+final class Transaction extends AbstractTransactionPDO
 {
     public function releaseSavepoint(string $name): void
     {

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -11,9 +11,9 @@
 use Yiisoft\Db\Exception\InvalidCallException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Oracle\ConnectionPDO;
+use Yiisoft\Db\Oracle\Connection;
 use Yiisoft\Db\Oracle\Dsn;
-use Yiisoft\Db\Oracle\PDODriver;
+use Yiisoft\Db\Oracle\Driver;
 use Yiisoft\Db\Oracle\Tests\Support\TestTrait;
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Schema\SchemaInterface;
@@ -575,7 +575,7 @@ public function testProfilerData(string $sql = null): void
     public function testShowDatabases(): void
     {
         $dsn = new Dsn('oci', 'localhost');
-        $db = new ConnectionPDO(new PDODriver($dsn->asString(), 'SYSTEM', 'root'), DbHelper::getSchemaCache());
+        $db = new Connection(new Driver($dsn->asString(), 'SYSTEM', 'root'), DbHelper::getSchemaCache());
 
         $command = $db->createCommand();
 

diff --git a/tests/Support/TestTrait.php b/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\Oracle\ConnectionPDO;
+use Yiisoft\Db\Oracle\Connection;
 use Yiisoft\Db\Oracle\Dsn;
-use Yiisoft\Db\Oracle\PDODriver;
+use Yiisoft\Db\Oracle\Driver;
 use Yiisoft\Db\Tests\Support\DbHelper;
 
 trait TestTrait
@@ -22,7 +22,7 @@ trait TestTrait
      */
     protected function getConnection(bool $fixture = false): ConnectionPDOInterface
     {
-        $db = new ConnectionPDO(new PDODriver($this->getDsn(), 'system', 'root'), DbHelper::getSchemaCache());
+        $db = new Connection(new Driver($this->getDsn(), 'system', 'root'), DbHelper::getSchemaCache());
 
         if ($fixture) {
             DbHelper::loadFixture($db, __DIR__ . '/Fixture/oci.sql');
@@ -35,7 +35,7 @@ protected static function getDb(): ConnectionPDOInterface
     {
         $dsn = (new Dsn('oci', 'localhost', 'XE', '1521', ['charset' => 'AL32UTF8']))->asString();
 
-        return new ConnectionPDO(new PDODriver($dsn, 'system', 'root'), DbHelper::getSchemaCache());
+        return new Connection(new Driver($dsn, 'system', 'root'), DbHelper::getSchemaCache());
     }
 
     protected function getDsn(): string