mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-05 05:37: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
{
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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

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

@@ -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,
) {
}

7
src/Dibi/ResultIterator.php
View File

@@ -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,
) {
}