0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix DB

Browse source
This commit is contained in:
Visman 2021-12-22 23:27:48 +07:00
parent af7f4845f9
commit 24bbdfe271
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Core/DB.php
View file

@ -10,7 +10,7 @@ declare(strict_types=1);
namespace ForkBB\Core;
use ForkBB\Core\DB\Statement;
use ForkBB\Core\DB\DBStatement;
use PDO;
use PDOStatement;
use PDOException;
@ -151,7 +151,7 @@ class DB
if (\is_file(__DIR__ . "/DB/{$typeU}Statement.php")) {
$this->statementClass = "ForkBB\\Core\\DB\\{$typeU}Statement}";
} else {
$this->statementClass = Statement::class;
$this->statementClass = DBStatement::class;
}
if ('sqlite' === $type) {
@ -181,18 +181,18 @@ class DB
}
$options += [
self::ATTR_DEFAULT_FETCH_MODE => self::FETCH_ASSOC,
self::ATTR_EMULATE_PREPARES => false,
self::ATTR_STRINGIFY_FETCHES => false,
self::ATTR_ERRMODE => self::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_STRINGIFY_FETCHES => false,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
];
return $result;
}
protected function dbStatement(PDOStatement $stmt): Statement
protected function dbStatement(PDOStatement $stmt): DBStatement
{
return new {$this->statementClass}($this, $stmt);
return new $this->statementClass($this, $stmt);
}
/**
@ -354,7 +354,7 @@ class DB
/**
* Метод расширяет PDO::prepare()
*/
public function prepare(string $query, array $params = [], array $options = null): /* : Statement|false */
public function prepare(string $query, array $params = [], array $options = null) /* : DBStatement|false */
{
$map = $this->parse($query, $params);
$start = \microtime(true);
@ -376,7 +376,7 @@ class DB
/**
* Метод расширяет PDO::query()
*/
public function query(string $query, /* mixed */ ...$args) /* : Statement|false */
public function query(string $query, /* mixed */ ...$args) /* : DBStatement|false */
{
if (
isset($args[0])
@ -472,7 +472,7 @@ class DB
if (isset($this->pdoMethods[$name])) {
return $this->pdo->$name(...$args);
} elseif (empty($this->dbDrv)) {
$this->dbDrv = new {$this->dbDrvClass}($this, $this->dbPrefix);
$this->dbDrv = new $this->dbDrvClass($this, $this->dbPrefix);
// ????? проверка типа
}