libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Уточнения к типам

Browse source
This commit is contained in:
origami11@yandex.ru 2024-01-26 16:56:51 +03:00
parent 5cfd2ee773
commit 548d5daaa9
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Database.php
View file

@ -1,6 +1,4 @@
<?php
///<reference path="Database/PDOStatement.php" />
namespace {
if(!function_exists('sqliteLower')){
function sqliteLower($str) {
@ -18,7 +16,7 @@ use PDO,
/**
* Класс оболочка для PDO для замены Creole
*/
class Database/*<Database_PDOStatement>*/ extends PDO
class Database extends PDO
{
public $dsn;
@ -27,7 +25,7 @@ class Database/*<Database_PDOStatement>*/ extends PDO
parent::__construct($dsn, $username, $password);
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('ctiso\\Database\\PDOStatement', array()));
$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array(PDOStatement::class, array()));
}
function prepare(string $sql, array $options = []): PDOStatement|false {
@ -71,9 +69,9 @@ class Database/*<Database_PDOStatement>*/ extends PDO
return $connection;
}
public function executeQuery($query, $values=null)
public function executeQuery($query, $values=null): PDOStatement|bool
{
$stmt/*: PDOStatement*/ = $this->prepare($query);
$stmt = $this->prepare($query);
$stmt->execute($values);
$stmt->cache = $stmt->fetchAll(PDO::FETCH_ASSOC);
@ -91,7 +89,7 @@ class Database/*<Database_PDOStatement>*/ extends PDO
*/
public function fetchAllArray($query, $values = null)
{
$sth/*: PDOStatement*/ = $this->prepare($query);
$sth = $this->prepare($query);
$prep = $this->prepareValues($values);
$sth->execute($prep);
return $sth->fetchAll(PDO::FETCH_ASSOC);
@ -102,7 +100,7 @@ class Database/*<Database_PDOStatement>*/ extends PDO
*/
public function fetchOneArray($query, $values = null)
{
$sth/*: PDOStatement*/ = $this->prepare($query);
$sth = $this->prepare($query);
$prep = $this->prepareValues($values);
$sth->execute($prep);
return $sth->fetch(PDO::FETCH_ASSOC);