Extending the driver, adding methods to use transactions

Author: microwin7

composer.json

@@ -11,7 +11,7 @@
         "ext-mysqli": "*",
         "ext-json": "*",
         "microwin7/rcon": "^1.1",
-        "sentry/sentry": "^4.7"
+        "sentry/sentry": "^4.10"
     },
     "autoload": {
         "psr-4": {
@@ -34,6 +34,6 @@
     },
     "minimum-stability": "stable",
     "require-dev": {
-        "vimeo/psalm": "5.x-dev"
+        "vimeo/psalm": "6.8.8"
     }
 }

src/DB/Connector.php

@@ -8,24 +8,34 @@
 
 class Connector
 {
-    /** @var array<string, DriverPDO> */
+    /** @var array<string, DriverPDOInterface> */
     protected array $database = [];
 
-    public function __get(string $database): DriverPDO
+    /** @var class-string<DriverPDOInterface> */
+    protected static string $driver = DriverPDO::class;
+
+    public static function setCustomDriver(string $classDriver): void
+    {
+        if (is_subclass_of($classDriver, DriverPDOInterface::class)) {
+            self::$driver = $classDriver;
+        } else {
+            throw new \RuntimeException("This $classDriver is not an implementation of " . DriverPDOInterface::class);
+        }
+    }
+    public function __get(string $database): DriverPDOInterface
     {
         if (array_key_exists($database, $this->database)) return $this->database[$database];
         return $this->getConnect($database);
     }
-
-    private function getConnect(string $database): DriverPDO
+    private function getConnect(string $database): DriverPDOInterface
     {
         $module = [];
         if (empty($database) || $database == Main::DB_NAME()) $database = Main::DB_NAME();
         else {
             try {
                 /** @psalm-suppress RedundantFunctionCall */
                 $database = strtolower(Main::DB_PREFIX_SERVERS() . Main::getServerWithoutDefault($database));
-            } catch (ServerNotFoundException $e) {
+            } catch (ServerNotFoundException) {
                 $modules_keys_lower_case = array_change_key_case(MainConfig::MODULES);
                 $key_exists = array_key_exists(strtolower($database), $modules_keys_lower_case);
                 if ($key_exists === true) {
@@ -38,14 +48,6 @@ private function getConnect(string $database): DriverPDO
             }
         }
         if (array_key_exists($database, $this->database)) return $this->database[$database];
-        return new DriverPDO($database, $module['prefix'] ?? '');
-        // /**
-        //  * @var string $module['prefix']
-        //  * @psalm-suppress TypeDoesNotContainType
-        //  */
-        // return $this->database[$database] = match (MainConfig::DB_DRIVER) {
-        //     DriverTypeEnum::MySQLi => new DriverMySQLi($database, $module['prefix'] ?? ''),
-        //     DriverTypeEnum::PDO => new DriverPDO($database, $module['prefix'] ?? ''),
-        // };
+        return new self::$driver($database, $module['prefix'] ?? '');
     }
 }

src/DB/DriverMySQLi.php

@@ -11,9 +11,9 @@
 /**
  * @template-implements \Iterator<int, array>
  */
-class DriverPDO implements \Iterator
+class DriverPDO implements \Iterator, DriverPDOInterface
 {
-    private \PDO $DBH;
+    protected \PDO $DBH;
     private string $DSN;
     /** @psalm-suppress PropertyNotSetInConstructor */
     private \PDOStatement $STH;
@@ -63,6 +63,26 @@ private function preConnectionExec(): void
     public function __destruct()
     {
     }
+    public function getDBH(): \PDO
+    {
+        return $this->DBH;
+    }
+    public function beginTransaction(): bool
+    {
+        return $this->DBH->beginTransaction();
+    }
+    public function inTransaction(): bool
+    {
+        return $this->DBH->inTransaction();
+    }
+    public function commit(): bool
+    {
+        return $this->DBH->commit();
+    }
+    public function rollback(): bool
+    {
+        return $this->DBH->rollBack();
+    }
     private function table(string $table): string
     {
         return $this->table_prefix . $table . ' ';
@@ -144,25 +164,14 @@ public function query(string $sql, string $param_type = "", mixed ...$params): s
         }
         try {
             $this->insert_id = $this->DBH->lastInsertId();
-        } catch (\PDOException $ignored) {
+        } catch (\PDOException) {
             // Ошибка только с postgresql, предположительно, необходимо вызывать NEXTVAL('?') до LASTVAL()
             //Fatal error: Uncaught PDOException: SQLSTATE[55000]: Object not in prerequisite state: 7 ERROR:
             //lastval is not yet defined in this session in Utils/DBDriverPDO.php:136
         }
         return $this;
     }
 
-    // public function execute(){
-    //     try {
-    //         $this->STH->execute();
-    //     } catch (\PDOException $e) {
-    //         $this->debug->debug_error($param_type ?
-    //             "[{$this->database}] Statement execution error: {$e}\n$sql with params:\n$param_type -> " . implode(', ', $params) :
-    //             "[{$this->database}] Statement execution error: {$e}\n$sql");
-    //         throw new DBException('SQL query error');
-    //     }
-    // }
-
     public function getStatementHandler(): \PDOStatement
     {
         return $this->STH;
@@ -238,20 +247,10 @@ public function all(): array
      * @param array $constructor_args Аргументы для конструктора передаваемого класса, для заполнения
      * @return T|null Возвращает объект с параметрами класса как в БД и заполненными добавочными данными из аргументов констркутора класса
      */
-    public function obj($class = \stdClass::class, array $constructor_args = [])
+    public function obj($class = \stdClass::class, array $constructor_args = []): object|null
     {
         return $this->STH->fetchObject($class, $constructor_args) ?: null;
     }
-    /**
-     * Индексированный массив объектов результата
-     * Use objects()
-     * @deprecated
-     * @return array
-     */
-    public function object(): array
-    {
-        return $this->objects();
-    }
     // Индексированный массив объектов результата
     /**
      * @template T of object