diff --git a/src/Dibi/Bridges/Nette/DibiExtension22.php b/src/Dibi/Bridges/Nette/DibiExtension22.php index a01e1e41..8f310b03 100644 --- a/src/Dibi/Bridges/Nette/DibiExtension22.php +++ b/src/Dibi/Bridges/Nette/DibiExtension22.php @@ -19,14 +19,10 @@ use Tracy; */ class DibiExtension22 extends Nette\DI\CompilerExtension { - private ?bool $debugMode; - private ?bool $cliMode; - - - public function __construct(?bool $debugMode = null, ?bool $cliMode = null) - { - $this->debugMode = $debugMode; - $this->cliMode = $cliMode; + public function __construct( + private ?bool $debugMode = null, + private ?bool $cliMode = null, + ) { } diff --git a/src/Dibi/Bridges/Nette/DibiExtension3.php b/src/Dibi/Bridges/Nette/DibiExtension3.php index b8b4cece..b5921dac 100644 --- a/src/Dibi/Bridges/Nette/DibiExtension3.php +++ b/src/Dibi/Bridges/Nette/DibiExtension3.php @@ -20,14 +20,10 @@ use Tracy; */ class DibiExtension3 extends Nette\DI\CompilerExtension { - private ?bool $debugMode; - private ?bool $cliMode; - - - public function __construct(?bool $debugMode = null, ?bool $cliMode = null) - { - $this->debugMode = $debugMode; - $this->cliMode = $cliMode; + public function __construct( + private ?bool $debugMode = null, + private ?bool $cliMode = null, + ) { } diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php index 97694b51..50071e39 100644 --- a/src/Dibi/Bridges/Tracy/Panel.php +++ b/src/Dibi/Bridges/Tracy/Panel.php @@ -21,15 +21,14 @@ use Tracy; class Panel implements Tracy\IBarPanel { public static int $maxLength = 1000; - public bool|string $explain; - public int $filter; + private array $events = []; - public function __construct(bool $explain = true, ?int $filter = null) - { - $this->filter = $filter ?: Event::QUERY; - $this->explain = $explain; + public function __construct( + public bool|string $explain = true, + public int $filter = Event::QUERY, + ) { } diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/FirebirdReflector.php index 4114f235..ea992896 100644 --- a/src/Dibi/Drivers/FirebirdReflector.php +++ b/src/Dibi/Drivers/FirebirdReflector.php @@ -17,12 +17,9 @@ use Dibi; */ class FirebirdReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/FirebirdResult.php index a4c0ba78..38ca75c5 100644 --- a/src/Dibi/Drivers/FirebirdResult.php +++ b/src/Dibi/Drivers/FirebirdResult.php @@ -18,16 +18,10 @@ use Dibi\Helpers; */ class FirebirdResult implements Dibi\ResultDriver { - /** @var resource */ - private $resultSet; - - - /** - * @param resource $resultSet - */ - public function __construct($resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + /** @var resource */ + private $resultSet, + ) { } diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php index dbd55828..d4e655d2 100644 --- a/src/Dibi/Drivers/MySqlReflector.php +++ b/src/Dibi/Drivers/MySqlReflector.php @@ -18,12 +18,9 @@ use Dibi; */ class MySqlReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySqliResult.php index 4469ef0c..20f8aa79 100644 --- a/src/Dibi/Drivers/MySqliResult.php +++ b/src/Dibi/Drivers/MySqliResult.php @@ -17,14 +17,10 @@ use Dibi; */ class MySqliResult implements Dibi\ResultDriver { - private \mysqli_result $resultSet; - private bool $buffered; - - - public function __construct(\mysqli_result $resultSet, bool $buffered) - { - $this->resultSet = $resultSet; - $this->buffered = $buffered; + public function __construct( + private \mysqli_result $resultSet, + private bool $buffered, + ) { } diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/NoDataResult.php index f427dc4e..cec1547f 100644 --- a/src/Dibi/Drivers/NoDataResult.php +++ b/src/Dibi/Drivers/NoDataResult.php @@ -17,12 +17,9 @@ use Dibi; */ class NoDataResult implements Dibi\ResultDriver { - private int $rows; - - - public function __construct(int $rows) - { - $this->rows = $rows; + public function __construct( + private int $rows, + ) { } diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/OdbcReflector.php index 3285fe03..e922a49c 100644 --- a/src/Dibi/Drivers/OdbcReflector.php +++ b/src/Dibi/Drivers/OdbcReflector.php @@ -17,12 +17,9 @@ use Dibi; */ class OdbcReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/OdbcResult.php index c8d88e7d..3a985a83 100644 --- a/src/Dibi/Drivers/OdbcResult.php +++ b/src/Dibi/Drivers/OdbcResult.php @@ -17,17 +17,13 @@ use Dibi; */ class OdbcResult implements Dibi\ResultDriver { - /** @var resource */ - private $resultSet; private int $row = 0; - /** - * @param resource $resultSet - */ - public function __construct($resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + /** @var resource */ + private $resultSet, + ) { } diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/OracleReflector.php index 74c3db69..031d78fd 100644 --- a/src/Dibi/Drivers/OracleReflector.php +++ b/src/Dibi/Drivers/OracleReflector.php @@ -17,12 +17,9 @@ use Dibi; */ class OracleReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OracleResult.php index b1590546..ca691559 100644 --- a/src/Dibi/Drivers/OracleResult.php +++ b/src/Dibi/Drivers/OracleResult.php @@ -17,16 +17,10 @@ use Dibi; */ class OracleResult implements Dibi\ResultDriver { - /** @var resource */ - private $resultSet; - - - /** - * @param resource $resultSet - */ - public function __construct($resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + /** @var resource */ + private $resultSet, + ) { } diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PdoResult.php index d0e22371..f88d9f98 100644 --- a/src/Dibi/Drivers/PdoResult.php +++ b/src/Dibi/Drivers/PdoResult.php @@ -19,14 +19,10 @@ use PDO; */ class PdoResult implements Dibi\ResultDriver { - private ?\PDOStatement $resultSet; - private string $driverName; - - - public function __construct(\PDOStatement $resultSet, string $driverName) - { - $this->resultSet = $resultSet; - $this->driverName = $driverName; + public function __construct( + private ?\PDOStatement $resultSet, + private string $driverName, + ) { } diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/PostgreReflector.php index 29a33c15..5bda3b9d 100644 --- a/src/Dibi/Drivers/PostgreReflector.php +++ b/src/Dibi/Drivers/PostgreReflector.php @@ -17,14 +17,10 @@ use Dibi; */ class PostgreReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - private string $version; - - - public function __construct(Dibi\Driver $driver, string $version) - { - $this->driver = $driver; - $this->version = $version; + public function __construct( + private Dibi\Driver $driver, + private string $version, + ) { } diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PostgreResult.php index bcbecd29..0f2b00e0 100644 --- a/src/Dibi/Drivers/PostgreResult.php +++ b/src/Dibi/Drivers/PostgreResult.php @@ -19,16 +19,10 @@ use PgSql; */ class PostgreResult implements Dibi\ResultDriver { - /** @var resource|PgSql\Result */ - private $resultSet; - - - /** - * @param resource|PgSql\Result $resultSet - */ - public function __construct($resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + /** @var resource|PgSql\Result */ + private $resultSet, + ) { } diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php index a85018e4..a8ce36ca 100644 --- a/src/Dibi/Drivers/SqliteReflector.php +++ b/src/Dibi/Drivers/SqliteReflector.php @@ -17,12 +17,9 @@ use Dibi; */ class SqliteReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SqliteResult.php index 218808b3..2c26e950 100644 --- a/src/Dibi/Drivers/SqliteResult.php +++ b/src/Dibi/Drivers/SqliteResult.php @@ -18,12 +18,9 @@ use Dibi\Helpers; */ class SqliteResult implements Dibi\ResultDriver { - private \SQLite3Result $resultSet; - - - public function __construct(\SQLite3Result $resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + private \SQLite3Result $resultSet, + ) { } diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php index 32fec929..386cbb12 100644 --- a/src/Dibi/Drivers/SqlsrvReflector.php +++ b/src/Dibi/Drivers/SqlsrvReflector.php @@ -17,12 +17,9 @@ use Dibi; */ class SqlsrvReflector implements Dibi\Reflector { - private Dibi\Driver $driver; - - - public function __construct(Dibi\Driver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\Driver $driver, + ) { } diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SqlsrvResult.php index ecd6ed53..8ad14a74 100644 --- a/src/Dibi/Drivers/SqlsrvResult.php +++ b/src/Dibi/Drivers/SqlsrvResult.php @@ -17,16 +17,10 @@ use Dibi; */ class SqlsrvResult implements Dibi\ResultDriver { - /** @var resource */ - private $resultSet; - - - /** - * @param resource $resultSet - */ - public function __construct($resultSet) - { - $this->resultSet = $resultSet; + public function __construct( + /** @var resource */ + private $resultSet, + ) { } diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php index 24239e65..ca45288f 100644 --- a/src/Dibi/Loggers/FileLogger.php +++ b/src/Dibi/Loggers/FileLogger.php @@ -17,17 +17,11 @@ use Dibi; */ class FileLogger { - /** Name of the file where SQL errors should be logged */ - public string $file; - public int $filter; - private bool $errorsOnly; - - - public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false) - { - $this->file = $file; - $this->filter = $filter ?: Dibi\Event::QUERY; - $this->errorsOnly = $errorsOnly; + public function __construct( + public string $file, + public int $filter = Dibi\Event::QUERY, + private bool $errorsOnly = false, + ) { } diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index 5415501b..44ed7f1c 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -27,17 +27,10 @@ use Dibi; */ class Column { - /** when created by Result */ - private ?Dibi\Reflector $reflector; - - /** @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; + public function __construct( + private ?Dibi\Reflector $reflector, + private array $info, + ) { } diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php index a6c42efd..6a11ab72 100644 --- a/src/Dibi/Reflection/Database.php +++ b/src/Dibi/Reflection/Database.php @@ -21,17 +21,14 @@ use Dibi; */ class Database { - private Dibi\Reflector $reflector; - private ?string $name; - /** @var Table[] */ private array $tables; - public function __construct(Dibi\Reflector $reflector, ?string $name = null) - { - $this->reflector = $reflector; - $this->name = $name; + public function __construct( + private Dibi\Reflector $reflector, + private ?string $name = null, + ) { } diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php index 492a66f3..68730b0f 100644 --- a/src/Dibi/Reflection/ForeignKey.php +++ b/src/Dibi/Reflection/ForeignKey.php @@ -19,16 +19,10 @@ namespace Dibi\Reflection; */ class ForeignKey { - private string $name; - - /** @var array of [local, foreign, onDelete, onUpdate] */ - private array $references; - - - public function __construct(string $name, array $references) - { - $this->name = $name; - $this->references = $references; + public function __construct( + private string $name, + private array $references, + ) { } diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php index 13fe1df7..29739f3f 100644 --- a/src/Dibi/Reflection/Index.php +++ b/src/Dibi/Reflection/Index.php @@ -21,13 +21,9 @@ namespace Dibi\Reflection; */ class Index { - /** @var array (name, columns, [unique], [primary]) */ - private array $info; - - - public function __construct(array $info) - { - $this->info = $info; + public function __construct( + private array $info, + ) { } diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php index 3cd1dd93..f62b5239 100644 --- a/src/Dibi/Reflection/Result.php +++ b/src/Dibi/Reflection/Result.php @@ -20,8 +20,6 @@ use Dibi; */ class Result { - private Dibi\ResultDriver $driver; - /** @var Column[]|null */ private ?array $columns; @@ -29,9 +27,9 @@ class Result private ?array $names; - public function __construct(Dibi\ResultDriver $driver) - { - $this->driver = $driver; + public function __construct( + private Dibi\ResultDriver $driver, + ) { } diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php index 505489a9..d47ff882 100644 --- a/src/Dibi/ResultIterator.php +++ b/src/Dibi/ResultIterator.php @@ -15,14 +15,13 @@ namespace Dibi; */ class ResultIterator implements \Iterator, \Countable { - private Result $result; private mixed $row; private int $pointer = 0; - public function __construct(Result $result) - { - $this->result = $result; + public function __construct( + private Result $result, + ) { }