diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php index 89aa370..c7df9e0 100644 --- a/src/Dibi/DataSource.php +++ b/src/Dibi/DataSource.php @@ -15,8 +15,8 @@ namespace Dibi; */ class DataSource implements IDataSource { - private Connection $connection; - private string $sql; + private readonly Connection $connection; + private readonly string $sql; private ?Result $result = null; private ?int $count = null; private ?int $totalCount = null; diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/FirebirdReflector.php index ea99289..9b23fdd 100644 --- a/src/Dibi/Drivers/FirebirdReflector.php +++ b/src/Dibi/Drivers/FirebirdReflector.php @@ -18,7 +18,7 @@ use Dibi; class FirebirdReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php index d4e655d..0f968a7 100644 --- a/src/Dibi/Drivers/MySqlReflector.php +++ b/src/Dibi/Drivers/MySqlReflector.php @@ -19,7 +19,7 @@ use Dibi; class MySqlReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySqliResult.php index 20f8aa7..c993c94 100644 --- a/src/Dibi/Drivers/MySqliResult.php +++ b/src/Dibi/Drivers/MySqliResult.php @@ -18,8 +18,8 @@ use Dibi; class MySqliResult implements Dibi\ResultDriver { public function __construct( - private \mysqli_result $resultSet, - private bool $buffered, + private readonly \mysqli_result $resultSet, + private readonly bool $buffered, ) { } diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/NoDataResult.php index cec1547..480db59 100644 --- a/src/Dibi/Drivers/NoDataResult.php +++ b/src/Dibi/Drivers/NoDataResult.php @@ -18,7 +18,7 @@ use Dibi; class NoDataResult implements Dibi\ResultDriver { public function __construct( - private int $rows, + private readonly int $rows, ) { } diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/OdbcReflector.php index e922a49..0ec04a4 100644 --- a/src/Dibi/Drivers/OdbcReflector.php +++ b/src/Dibi/Drivers/OdbcReflector.php @@ -18,7 +18,7 @@ use Dibi; class OdbcReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/OracleReflector.php index 031d78f..1ab4962 100644 --- a/src/Dibi/Drivers/OracleReflector.php +++ b/src/Dibi/Drivers/OracleReflector.php @@ -18,7 +18,7 @@ use Dibi; class OracleReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PdoResult.php index f88d9f9..bfb0f60 100644 --- a/src/Dibi/Drivers/PdoResult.php +++ b/src/Dibi/Drivers/PdoResult.php @@ -21,7 +21,7 @@ class PdoResult implements Dibi\ResultDriver { public function __construct( private ?\PDOStatement $resultSet, - private string $driverName, + private readonly string $driverName, ) { } diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/PostgreReflector.php index 5bda3b9..68679d3 100644 --- a/src/Dibi/Drivers/PostgreReflector.php +++ b/src/Dibi/Drivers/PostgreReflector.php @@ -18,8 +18,8 @@ use Dibi; class PostgreReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, - private string $version, + private readonly Dibi\Driver $driver, + private readonly string $version, ) { } diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PostgreResult.php index 62851e3..e74f36c 100644 --- a/src/Dibi/Drivers/PostgreResult.php +++ b/src/Dibi/Drivers/PostgreResult.php @@ -20,7 +20,7 @@ use PgSql; class PostgreResult implements Dibi\ResultDriver { public function __construct( - private PgSql\Result $resultSet, + private readonly PgSql\Result $resultSet, ) { } diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php index a8ce36c..8c1e3ad 100644 --- a/src/Dibi/Drivers/SqliteReflector.php +++ b/src/Dibi/Drivers/SqliteReflector.php @@ -18,7 +18,7 @@ use Dibi; class SqliteReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SqliteResult.php index 2c26e95..c3fef40 100644 --- a/src/Dibi/Drivers/SqliteResult.php +++ b/src/Dibi/Drivers/SqliteResult.php @@ -19,7 +19,7 @@ use Dibi\Helpers; class SqliteResult implements Dibi\ResultDriver { public function __construct( - private \SQLite3Result $resultSet, + private readonly \SQLite3Result $resultSet, ) { } diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php index 386cbb1..b19249a 100644 --- a/src/Dibi/Drivers/SqlsrvReflector.php +++ b/src/Dibi/Drivers/SqlsrvReflector.php @@ -18,7 +18,7 @@ use Dibi; class SqlsrvReflector implements Dibi\Reflector { public function __construct( - private Dibi\Driver $driver, + private readonly Dibi\Driver $driver, ) { } diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php index 92f4a16..9b9e879 100644 --- a/src/Dibi/Event.php +++ b/src/Dibi/Event.php @@ -29,10 +29,10 @@ class Event TRANSACTION = 448, // BEGIN | COMMIT | ROLLBACK ALL = 1023; - public Connection $connection; + public readonly Connection $connection; public int $type; - public string $sql; - public Result|DriverException|null $result; + public readonly string $sql; + public readonly Result|DriverException|null $result; public float $time; public ?int $count = null; public ?array $source = null; diff --git a/src/Dibi/Expression.php b/src/Dibi/Expression.php index e550299..c3f1749 100644 --- a/src/Dibi/Expression.php +++ b/src/Dibi/Expression.php @@ -15,7 +15,7 @@ namespace Dibi; */ class Expression { - private array $values; + private readonly array $values; public function __construct(...$values) diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index c24c06e..2922e92 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -97,7 +97,7 @@ class Fluent implements IDataSource 'RIGHT JOIN' => 'FROM', ]; - private Connection $connection; + private readonly Connection $connection; private array $setups = []; private ?string $command = null; private array $clauses = []; diff --git a/src/Dibi/Literal.php b/src/Dibi/Literal.php index ca39585..15eecdf 100644 --- a/src/Dibi/Literal.php +++ b/src/Dibi/Literal.php @@ -15,7 +15,7 @@ namespace Dibi; */ class Literal { - private string $value; + private readonly string $value; public function __construct($value) diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index 44ed7f1..0ae1e58 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -28,7 +28,7 @@ use Dibi; class Column { public function __construct( - private ?Dibi\Reflector $reflector, + private readonly ?Dibi\Reflector $reflector, private array $info, ) { } diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php index 6a11ab7..d471c7d 100644 --- a/src/Dibi/Reflection/Database.php +++ b/src/Dibi/Reflection/Database.php @@ -26,7 +26,7 @@ class Database public function __construct( - private Dibi\Reflector $reflector, + private readonly Dibi\Reflector $reflector, private ?string $name = null, ) { } diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php index 68730b0..c7f005b 100644 --- a/src/Dibi/Reflection/ForeignKey.php +++ b/src/Dibi/Reflection/ForeignKey.php @@ -20,8 +20,8 @@ namespace Dibi\Reflection; class ForeignKey { public function __construct( - private string $name, - private array $references, + private readonly string $name, + private readonly array $references, ) { } diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php index 29739f3..71e426c 100644 --- a/src/Dibi/Reflection/Index.php +++ b/src/Dibi/Reflection/Index.php @@ -22,7 +22,7 @@ namespace Dibi\Reflection; class Index { public function __construct( - private array $info, + private readonly array $info, ) { } diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php index f62b523..2218f08 100644 --- a/src/Dibi/Reflection/Result.php +++ b/src/Dibi/Reflection/Result.php @@ -28,7 +28,7 @@ class Result public function __construct( - private Dibi\ResultDriver $driver, + private readonly Dibi\ResultDriver $driver, ) { } diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php index b03d480..7c5b64e 100644 --- a/src/Dibi/Reflection/Table.php +++ b/src/Dibi/Reflection/Table.php @@ -25,7 +25,7 @@ use Dibi; */ class Table { - private Dibi\Reflector $reflector; + private readonly Dibi\Reflector $reflector; private string $name; private bool $view; diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php index d47ff88..6bac6b5 100644 --- a/src/Dibi/ResultIterator.php +++ b/src/Dibi/ResultIterator.php @@ -20,7 +20,7 @@ class ResultIterator implements \Iterator, \Countable public function __construct( - private Result $result, + private readonly Result $result, ) { } diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index e20ee05..8dc4063 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -15,8 +15,8 @@ namespace Dibi; */ final class Translator { - private Connection $connection; - private Driver $driver; + private readonly Connection $connection; + private readonly Driver $driver; private int $cursor = 0; private array $args;