1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-06 14:16:39 +02:00
This commit is contained in:
David Grudl
2020-01-12 13:46:23 +01:00
parent 21dad1d846
commit efe1cbdc20
14 changed files with 23 additions and 69 deletions

View File

@@ -40,9 +40,7 @@ class FirebirdDriver implements Dibi\Driver
private $inTransaction = false; private $inTransaction = false;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('interbase')) { if (!extension_loaded('interbase')) {

View File

@@ -47,9 +47,7 @@ class MySqliDriver implements Dibi\Driver
private $buffered; private $buffered;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('mysqli')) { if (!extension_loaded('mysqli')) {

View File

@@ -37,9 +37,7 @@ class OdbcDriver implements Dibi\Driver
private $microseconds = true; private $microseconds = true;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('odbc')) { if (!extension_loaded('odbc')) {

View File

@@ -42,9 +42,7 @@ class OracleDriver implements Dibi\Driver
private $affectedRows; private $affectedRows;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('oci8')) { if (!extension_loaded('oci8')) {

View File

@@ -42,9 +42,7 @@ class PdoDriver implements Dibi\Driver
private $serverVersion = ''; private $serverVersion = '';
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('pdo')) { if (!extension_loaded('pdo')) {

View File

@@ -35,9 +35,7 @@ class PostgreDriver implements Dibi\Driver
private $affectedRows; private $affectedRows;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('pgsql')) { if (!extension_loaded('pgsql')) {

View File

@@ -37,9 +37,7 @@ class SqliteDriver implements Dibi\Driver
private $fmtDateTime; private $fmtDateTime;
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('sqlite3')) { if (!extension_loaded('sqlite3')) {

View File

@@ -39,9 +39,7 @@ class SqlsrvDriver implements Dibi\Driver
private $version = ''; private $version = '';
/** /** @throws Dibi\NotSupportedException */
* @throws Dibi\NotSupportedException
*/
public function __construct(array $config) public function __construct(array $config)
{ {
if (!extension_loaded('sqlsrv')) { if (!extension_loaded('sqlsrv')) {

View File

@@ -201,9 +201,7 @@ class Helpers
} }
/** /** @internal */
* @internal
*/
public static function getTypeCache(): HashMap public static function getTypeCache(): HashMap
{ {
if (self::$types === null) { if (self::$types === null) {
@@ -279,18 +277,14 @@ class Helpers
} }
/** /** @internal */
* @internal
*/
public static function false2Null($val) public static function false2Null($val)
{ {
return $val === false ? null : $val; return $val === false ? null : $val;
} }
/** /** @internal */
* @internal
*/
public static function intVal($value): int public static function intVal($value): int
{ {
if (is_int($value)) { if (is_int($value)) {

View File

@@ -106,18 +106,14 @@ class Column
} }
/** /** @return mixed */
* @return mixed
*/
public function getDefault() public function getDefault()
{ {
return $this->info['default'] ?? null; return $this->info['default'] ?? null;
} }
/** /** @return mixed */
* @return mixed
*/
public function getVendorInfo(string $key) public function getVendorInfo(string $key)
{ {
return $this->info['vendor'][$key] ?? null; return $this->info['vendor'][$key] ?? null;

View File

@@ -46,9 +46,7 @@ class Database
} }
/** /** @return Table[] */
* @return Table[]
*/
public function getTables(): array public function getTables(): array
{ {
$this->init(); $this->init();
@@ -56,9 +54,7 @@ class Database
} }
/** /** @return string[] */
* @return string[]
*/
public function getTableNames(): array public function getTableNames(): array
{ {
$this->init(); $this->init();

View File

@@ -38,9 +38,7 @@ class Result
} }
/** /** @return Column[] */
* @return Column[]
*/
public function getColumns(): array public function getColumns(): array
{ {
$this->initColumns(); $this->initColumns();
@@ -48,9 +46,7 @@ class Result
} }
/** /** @return string[] */
* @return string[]
*/
public function getColumnNames(bool $fullNames = false): array public function getColumnNames(bool $fullNames = false): array
{ {
$this->initColumns(); $this->initColumns();

View File

@@ -69,9 +69,7 @@ class Table
} }
/** /** @return Column[] */
* @return Column[]
*/
public function getColumns(): array public function getColumns(): array
{ {
$this->initColumns(); $this->initColumns();
@@ -79,9 +77,7 @@ class Table
} }
/** /** @return string[] */
* @return string[]
*/
public function getColumnNames(): array public function getColumnNames(): array
{ {
$this->initColumns(); $this->initColumns();
@@ -113,9 +109,7 @@ class Table
} }
/** /** @return ForeignKey[] */
* @return ForeignKey[]
*/
public function getForeignKeys(): array public function getForeignKeys(): array
{ {
$this->initForeignKeys(); $this->initForeignKeys();
@@ -123,9 +117,7 @@ class Table
} }
/** /** @return Index[] */
* @return Index[]
*/
public function getIndexes(): array public function getIndexes(): array
{ {
$this->initIndexes(); $this->initIndexes();

View File

@@ -296,9 +296,7 @@ class Result implements IDataSource
} }
/** /** @deprecated */
* @deprecated
*/
private function oldFetchAssoc(string $assoc) private function oldFetchAssoc(string $assoc)
{ {
$this->seek(0); $this->seek(0);
@@ -569,9 +567,7 @@ class Result implements IDataSource
} }
/** /** @return Reflection\Column[] */
* @return Reflection\Column[]
*/
final public function getColumns(): array final public function getColumns(): array
{ {
return $this->getInfo()->getColumns(); return $this->getInfo()->getColumns();