mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-06 06:07:39 +02:00
Code Issues Releases Wiki Activity

uses promoted properties

Browse Source
This commit is contained in:
David Grudl
2024-09-03 16:22:07 +02:00
parent 0a66ad3f7b
commit 5d67a38235
26 changed files with 95 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Dibi/Bridges/Nette/DibiExtension22.php
View File

@@ -19,14 +19,10 @@ use Tracy;
*/ */
class DibiExtension22 extends Nette\DI\CompilerExtension class DibiExtension22 extends Nette\DI\CompilerExtension
{ {
private ?bool $debugMode; public function __construct(
private ?bool $cliMode; private ?bool $debugMode = null,
private ?bool $cliMode = null,
) {
public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
{
$this->debugMode = $debugMode;
$this->cliMode = $cliMode;
} }

12
src/Dibi/Bridges/Nette/DibiExtension3.php
View File

@@ -20,14 +20,10 @@ use Tracy;
*/ */
class DibiExtension3 extends Nette\DI\CompilerExtension class DibiExtension3 extends Nette\DI\CompilerExtension
{ {
private ?bool $debugMode; public function __construct(
private ?bool $cliMode; private ?bool $debugMode = null,
private ?bool $cliMode = null,
) {
public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
{
$this->debugMode = $debugMode;
$this->cliMode = $cliMode;
} }

11
src/Dibi/Bridges/Tracy/Panel.php
View File

@@ -21,15 +21,14 @@ use Tracy;
class Panel implements Tracy\IBarPanel class Panel implements Tracy\IBarPanel
{ {
public static int $maxLength = 1000; public static int $maxLength = 1000;
public bool|string $explain;
public int $filter;
private array $events = []; private array $events = [];
public function __construct(bool $explain = true, ?int $filter = null) public function __construct(
{ public bool|string $explain = true,
$this->filter = $filter ?: Event::QUERY; public int $filter = Event::QUERY,
$this->explain = $explain; ) {
} }

9
src/Dibi/Drivers/FirebirdReflector.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class FirebirdReflector implements Dibi\Reflector class FirebirdReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

12
src/Dibi/Drivers/FirebirdResult.php
View File

@@ -18,16 +18,10 @@ use Dibi\Helpers;
*/ */
class FirebirdResult implements Dibi\ResultDriver class FirebirdResult implements Dibi\ResultDriver
{ {
public function __construct(
/** @var resource */ /** @var resource */
private $resultSet; private $resultSet,
) {
/**
* @param resource $resultSet
*/
public function __construct($resultSet)
{
$this->resultSet = $resultSet;
} }

9
src/Dibi/Drivers/MySqlReflector.php
View File

@@ -18,12 +18,9 @@ use Dibi;
*/ */
class MySqlReflector implements Dibi\Reflector class MySqlReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

12
src/Dibi/Drivers/MySqliResult.php
View File

@@ -17,14 +17,10 @@ use Dibi;
*/ */
class MySqliResult implements Dibi\ResultDriver class MySqliResult implements Dibi\ResultDriver
{ {
private \mysqli_result $resultSet; public function __construct(
private bool $buffered; private \mysqli_result $resultSet,
private bool $buffered,
) {
public function __construct(\mysqli_result $resultSet, bool $buffered)
{
$this->resultSet = $resultSet;
$this->buffered = $buffered;
} }

9
src/Dibi/Drivers/NoDataResult.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class NoDataResult implements Dibi\ResultDriver class NoDataResult implements Dibi\ResultDriver
{ {
private int $rows; public function __construct(
private int $rows,
) {
public function __construct(int $rows)
{
$this->rows = $rows;
} }

9
src/Dibi/Drivers/OdbcReflector.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class OdbcReflector implements Dibi\Reflector class OdbcReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

12
src/Dibi/Drivers/OdbcResult.php
View File

@@ -17,17 +17,13 @@ use Dibi;
*/ */
class OdbcResult implements Dibi\ResultDriver class OdbcResult implements Dibi\ResultDriver
{ {
/** @var resource */
private $resultSet;
private int $row = 0; private int $row = 0;
/** public function __construct(
* @param resource $resultSet /** @var resource */
*/ private $resultSet,
public function __construct($resultSet) ) {
{
$this->resultSet = $resultSet;
} }

9
src/Dibi/Drivers/OracleReflector.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class OracleReflector implements Dibi\Reflector class OracleReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

12
src/Dibi/Drivers/OracleResult.php
View File

@@ -17,16 +17,10 @@ use Dibi;
*/ */
class OracleResult implements Dibi\ResultDriver class OracleResult implements Dibi\ResultDriver
{ {
public function __construct(
/** @var resource */ /** @var resource */
private $resultSet; private $resultSet,
) {
/**
* @param resource $resultSet
*/
public function __construct($resultSet)
{
$this->resultSet = $resultSet;
} }

12
src/Dibi/Drivers/PdoResult.php
View File

@@ -19,14 +19,10 @@ use PDO;
*/ */
class PdoResult implements Dibi\ResultDriver class PdoResult implements Dibi\ResultDriver
{ {
private ?\PDOStatement $resultSet; public function __construct(
private string $driverName; private ?\PDOStatement $resultSet,
private string $driverName,
) {
public function __construct(\PDOStatement $resultSet, string $driverName)
{
$this->resultSet = $resultSet;
$this->driverName = $driverName;
} }

12
src/Dibi/Drivers/PostgreReflector.php
View File

@@ -17,14 +17,10 @@ use Dibi;
*/ */
class PostgreReflector implements Dibi\Reflector class PostgreReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private string $version; private Dibi\Driver $driver,
private string $version,
) {
public function __construct(Dibi\Driver $driver, string $version)
{
$this->driver = $driver;
$this->version = $version;
} }

12
src/Dibi/Drivers/PostgreResult.php
View File

@@ -19,16 +19,10 @@ use PgSql;
*/ */
class PostgreResult implements Dibi\ResultDriver class PostgreResult implements Dibi\ResultDriver
{ {
public function __construct(
/** @var resource|PgSql\Result */ /** @var resource|PgSql\Result */
private $resultSet; private $resultSet,
) {
/**
* @param resource|PgSql\Result $resultSet
*/
public function __construct($resultSet)
{
$this->resultSet = $resultSet;
} }

9
src/Dibi/Drivers/SqliteReflector.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class SqliteReflector implements Dibi\Reflector class SqliteReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

9
src/Dibi/Drivers/SqliteResult.php
View File

@@ -18,12 +18,9 @@ use Dibi\Helpers;
*/ */
class SqliteResult implements Dibi\ResultDriver class SqliteResult implements Dibi\ResultDriver
{ {
private \SQLite3Result $resultSet; public function __construct(
private \SQLite3Result $resultSet,
) {
public function __construct(\SQLite3Result $resultSet)
{
$this->resultSet = $resultSet;
} }

9
src/Dibi/Drivers/SqlsrvReflector.php
View File

@@ -17,12 +17,9 @@ use Dibi;
*/ */
class SqlsrvReflector implements Dibi\Reflector class SqlsrvReflector implements Dibi\Reflector
{ {
private Dibi\Driver $driver; public function __construct(
private Dibi\Driver $driver,
) {
public function __construct(Dibi\Driver $driver)
{
$this->driver = $driver;
} }

12
src/Dibi/Drivers/SqlsrvResult.php
View File

@@ -17,16 +17,10 @@ use Dibi;
*/ */
class SqlsrvResult implements Dibi\ResultDriver class SqlsrvResult implements Dibi\ResultDriver
{ {
public function __construct(
/** @var resource */ /** @var resource */
private $resultSet; private $resultSet,
) {
/**
* @param resource $resultSet
*/
public function __construct($resultSet)
{
$this->resultSet = $resultSet;
} }

16
src/Dibi/Loggers/FileLogger.php
View File

@@ -17,17 +17,11 @@ use Dibi;
*/ */
class FileLogger class FileLogger
{ {
/** Name of the file where SQL errors should be logged */ public function __construct(
public string $file; public string $file,
public int $filter; public int $filter = Dibi\Event::QUERY,
private bool $errorsOnly; private bool $errorsOnly = false,
) {
public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false)
{
$this->file = $file;
$this->filter = $filter ?: Dibi\Event::QUERY;
$this->errorsOnly = $errorsOnly;
} }

15
src/Dibi/Reflection/Column.php
View File

@@ -27,17 +27,10 @@ use Dibi;
*/ */
class Column class Column
{ {
/** when created by Result */ public function __construct(
private ?Dibi\Reflector $reflector; private ?Dibi\Reflector $reflector,
private array $info,
/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */ ) {
private array $info;
public function __construct(?Dibi\Reflector $reflector, array $info)
{
$this->reflector = $reflector;
$this->info = $info;
} }

11
src/Dibi/Reflection/Database.php
View File

@@ -21,17 +21,14 @@ use Dibi;
*/ */
class Database class Database
{ {
private Dibi\Reflector $reflector;
private ?string $name;
/** @var Table[] */ /** @var Table[] */
private array $tables; private array $tables;
public function __construct(Dibi\Reflector $reflector, ?string $name = null) public function __construct(
{ private Dibi\Reflector $reflector,
$this->reflector = $reflector; private ?string $name = null,
$this->name = $name; ) {
} }

14
src/Dibi/Reflection/ForeignKey.php
View File

@@ -19,16 +19,10 @@ namespace Dibi\Reflection;
*/ */
class ForeignKey class ForeignKey
{ {
private string $name; public function __construct(
private string $name,
/** @var array of [local, foreign, onDelete, onUpdate] */ private array $references,
private array $references; ) {
public function __construct(string $name, array $references)
{
$this->name = $name;
$this->references = $references;
} }

10
src/Dibi/Reflection/Index.php
View File

@@ -21,13 +21,9 @@ namespace Dibi\Reflection;
*/ */
class Index class Index
{ {
/** @var array (name, columns, [unique], [primary]) */ public function __construct(
private array $info; private array $info,
) {
public function __construct(array $info)
{
$this->info = $info;
} }

8
src/Dibi/Reflection/Result.php
View File

@@ -20,8 +20,6 @@ use Dibi;
*/ */
class Result class Result
{ {
private Dibi\ResultDriver $driver;
/** @var Column[]|null */ /** @var Column[]|null */
private ?array $columns; private ?array $columns;
@@ -29,9 +27,9 @@ class Result
private ?array $names; private ?array $names;
public function __construct(Dibi\ResultDriver $driver) public function __construct(
{ private Dibi\ResultDriver $driver,
$this->driver = $driver; ) {
} }

7
src/Dibi/ResultIterator.php
View File

@@ -15,14 +15,13 @@ namespace Dibi;
*/ */
class ResultIterator implements \Iterator, \Countable class ResultIterator implements \Iterator, \Countable
{ {
private Result $result;
private mixed $row; private mixed $row;
private int $pointer = 0; private int $pointer = 0;
public function __construct(Result $result) public function __construct(
{ private Result $result,
$this->result = $result; ) {
} }