added property typehints

dg · dg · commit b76cb9e392ae · 2021-05-17T15:41:28.000+02:00
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -18,8 +18,7 @@
  */
 class DatabaseExtension extends Nette\DI\CompilerExtension
 {
-	/** @var bool */
-	private $debugMode;
+	private bool $debugMode;
 
 
 	public function __construct(bool $debugMode = false)
diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -22,32 +22,23 @@ class ConnectionPanel implements Tracy\IBarPanel
 {
 	use Nette\SmartObject;
 
-	/** @var int */
-	public $maxQueries = 100;
+	public int $maxQueries = 100;
 
-	/** @var string */
-	public $name;
+	public string $name;
 
-	/** @var bool|string explain queries? */
-	public $explain = true;
+	public bool|string $explain = true;
 
-	/** @var bool */
-	public $disabled = false;
+	public bool $disabled = false;
 
-	/** @var float */
-	public $performanceScale = 0.25;
+	public float $performanceScale = 0.25;
 
-	/** @var float logged time */
-	private $totalTime = 0;
+	private float $totalTime = 0;
 
-	/** @var int */
-	private $count = 0;
+	private int $count = 0;
 
-	/** @var array */
-	private $queries = [];
+	private array $queries = [];
 
-	/** @var Tracy\BlueScreen */
-	private $blueScreen;
+	private Tracy\BlueScreen $blueScreen;
 
 
 	public function __construct(Connection $connection, Tracy\BlueScreen $blueScreen)
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -28,29 +28,22 @@ class Connection
 	/** @var array<callable(self, ResultSet|DriverException): void>  Occurs after query is executed */
 	public $onQuery = [];
 
-	/** @var array */
-	private $params;
+	private array $params;
 
-	/** @var array */
-	private $options;
+	private array $options;
 
-	/** @var Driver */
-	private $driver;
+	private Driver $driver;
 
-	/** @var SqlPreprocessor */
-	private $preprocessor;
+	private SqlPreprocessor $preprocessor;
 
-	/** @var PDO|null */
-	private $pdo;
+	private ?PDO $pdo = null;
 
 	/** @var callable(array, ResultSet): array */
 	private $rowNormalizer = [Helpers::class, 'normalizeRow'];
 
-	/** @var string|null */
-	private $sql;
+	private ?string $sql = null;
 
-	/** @var int */
-	private $transactionDepth = 0;
+	private int $transactionDepth = 0;
 
 
 	public function __construct(string $dsn, string $user = null, string $password = null, array $options = null)
diff --git a/src/Database/Conventions/DiscoveredConventions.php b/src/Database/Conventions/DiscoveredConventions.php
@@ -18,8 +18,7 @@
  */
 class DiscoveredConventions implements Conventions
 {
-	/** @var IStructure */
-	protected $structure;
+	protected IStructure $structure;
 
 
 	public function __construct(IStructure $structure)
diff --git a/src/Database/Conventions/StaticConventions.php b/src/Database/Conventions/StaticConventions.php
@@ -20,14 +20,11 @@ class StaticConventions implements Conventions
 {
 	use Nette\SmartObject;
 
-	/** @var string */
-	protected $primary;
+	protected string $primary;
 
-	/** @var string */
-	protected $foreign;
+	protected string $foreign;
 
-	/** @var string */
-	protected $table;
+	protected string $table;
 
 
 	/**
diff --git a/src/Database/DriverException.php b/src/Database/DriverException.php
@@ -15,11 +15,9 @@
  */
 class DriverException extends \PDOException
 {
-	/** @var string */
-	public $queryString;
+	public ?string $queryString = null;
 
-	/** @var array */
-	public $params;
+	public ?array $params = null;
 
 
 	/**
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -19,8 +19,7 @@ class MsSqlDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
 
 	public function initialize(Nette\Database\Connection $connection, array $options): void
diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -24,8 +24,7 @@ class MySqlDriver implements Nette\Database\Driver
 		ERROR_DUPLICATE_ENTRY = 1062,
 		ERROR_DATA_TRUNCATED = 1265;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
 
 	/**
diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -19,11 +19,10 @@ class OciDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
-	/** @var string  Datetime format */
-	private $fmtDateTime;
+	/** Datetime format */
+	private string $fmtDateTime;
 
 
 	public function initialize(Nette\Database\Connection $connection, array $options): void
diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -19,8 +19,7 @@ class PgSqlDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
 
 	public function initialize(Nette\Database\Connection $connection, array $options): void
diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -19,11 +19,10 @@ class SqliteDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
-	/** @var string  Datetime format */
-	private $fmtDateTime;
+	/** Datetime format */
+	private string $fmtDateTime;
 
 
 	public function initialize(Nette\Database\Connection $connection, array $options): void
diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -19,11 +19,9 @@ class SqlsrvDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Database\Connection */
-	private $connection;
+	private Nette\Database\Connection $connection;
 
-	/** @var string */
-	private $version;
+	private string $version;
 
 
 	public function initialize(Nette\Database\Connection $connection, array $options): void
diff --git a/src/Database/Explorer.php b/src/Database/Explorer.php
@@ -20,17 +20,13 @@ class Explorer
 {
 	use Nette\SmartObject;
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var IStructure */
-	private $structure;
+	private IStructure $structure;
 
-	/** @var Conventions */
-	private $conventions;
+	private Conventions $conventions;
 
-	/** @var Nette\Caching\IStorage */
-	private $cacheStorage;
+	private ?Nette\Caching\IStorage $cacheStorage;
 
 
 	public function __construct(
diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -20,11 +20,10 @@ class Helpers
 {
 	use Nette\StaticClass;
 
-	/** @var int maximum SQL length */
-	public static $maxLength = 100;
+	/** maximum SQL length */
+	public static int $maxLength = 100;
 
-	/** @var array */
-	public static $typePatterns = [
+	public static array $typePatterns = [
 		'^_' => IStructure::FIELD_TEXT, // PostgreSQL arrays
 		'(TINY|SMALL|SHORT|MEDIUM|BIG|LONG)(INT)?|INT(EGER|\d+| IDENTITY)?|(SMALL|BIG|)SERIAL\d*|COUNTER|YEAR|BYTE|LONGLONG|UNSIGNED BIG INT' => IStructure::FIELD_INTEGER,
 		'(NEW)?DEC(IMAL)?(\(.*)?|NUMERIC|REAL|DOUBLE( PRECISION)?|FLOAT\d*|(SMALL)?MONEY|CURRENCY|NUMBER' => IStructure::FIELD_FLOAT,
diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -20,35 +20,27 @@ class ResultSet implements \Iterator, IRowContainer
 {
 	use Nette\SmartObject;
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var \PDOStatement|null */
-	private $pdoStatement;
+	private ?\PDOStatement $pdoStatement;
 
 	/** @var callable(array, ResultSet): array */
 	private $normalizer;
 
-	/** @var Row|false */
-	private $result;
+	private Row|false|null $result = null;
 
-	/** @var int */
-	private $resultKey = -1;
+	private int $resultKey = -1;
 
 	/** @var Row[] */
-	private $results;
+	private array $results;
 
-	/** @var float */
-	private $time;
+	private float $time;
 
-	/** @var string */
-	private $queryString;
+	private string $queryString;
 
-	/** @var array */
-	private $params;
+	private array $params;
 
-	/** @var array */
-	private $types;
+	private array $types;
 
 
 	public function __construct(Connection $connection, string $queryString, array $params, callable $normalizer = null)
@@ -124,7 +116,7 @@ public function getRowCount(): ?int
 
 	public function getColumnTypes(): array
 	{
-		if ($this->types === null) {
+		if (!isset($this->types)) {
 			$this->types = $this->connection->getDriver()->getColumnTypes($this->pdoStatement);
 		}
 		return $this->types;
@@ -207,7 +199,7 @@ public function fetch(): ?Row
 			$this->pdoStatement->closeCursor();
 			return null;
 
-		} elseif ($this->result === null && count($data) !== $this->pdoStatement->columnCount()) {
+		} elseif (!isset($this->result) && count($data) !== $this->pdoStatement->columnCount()) {
 			$duplicates = Helpers::findDuplicates($this->pdoStatement);
 			trigger_error("Found duplicate columns in database result set: $duplicates.", E_USER_NOTICE);
 		}
@@ -265,7 +257,7 @@ public function fetchPairs($key = null, $value = null): array
 	 */
 	public function fetchAll(): array
 	{
-		if ($this->results === null) {
+		if (!isset($this->results)) {
 			$this->results = iterator_to_array($this);
 		}
 		return $this->results;
diff --git a/src/Database/SqlLiteral.php b/src/Database/SqlLiteral.php
@@ -19,11 +19,9 @@ class SqlLiteral
 {
 	use Nette\SmartObject;
 
-	/** @var string */
-	private $value;
+	private string $value;
 
-	/** @var array */
-	private $parameters;
+	private array $parameters;
 
 
 	public function __construct(string $value, array $parameters = [])
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -50,26 +50,22 @@ class SqlPreprocessor
 		'EXPLAIN' => 1,
 	];
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var Driver */
-	private $driver;
+	private Driver $driver;
 
-	/** @var array of input parameters */
-	private $params;
+	/** input parameters */
+	private array $params;
 
-	/** @var array of parameters to be processed by PDO */
-	private $remaining;
+	/** parameters to be processed by PDO */
+	private array $remaining;
 
-	/** @var int */
-	private $counter;
+	private int $counter;
 
-	/** @var bool */
-	private $useParams;
+	private bool $useParams;
 
-	/** @var string|null values|set|and|order|items */
-	private $arrayMode;
+	/** values|set|and|order|items */
+	private ?string $arrayMode;
 
 
 	public function __construct(Connection $connection)
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -19,17 +19,13 @@ class Structure implements IStructure
 {
 	use Nette\SmartObject;
 
-	/** @var Connection */
-	protected $connection;
+	protected Connection $connection;
 
-	/** @var Nette\Caching\Cache */
-	protected $cache;
+	protected Nette\Caching\Cache $cache;
 
-	/** @var array */
-	protected $structure;
+	protected array $structure;
 
-	/** @var bool */
-	protected $isRebuilt = false;
+	protected bool $isRebuilt = false;
 
 
 	public function __construct(Connection $connection, Nette\Caching\IStorage $cacheStorage)
@@ -173,7 +169,7 @@ public function isRebuilt(): bool
 
 	protected function needStructure(): void
 	{
-		if ($this->structure !== null) {
+		if (isset($this->structure)) {
 			return;
 		}
 
diff --git a/src/Database/Table/ActiveRow.php b/src/Database/Table/ActiveRow.php
diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
diff --git a/tests/Database/Explorer/Explorer.cache.observer2.phpt b/tests/Database/Explorer/Explorer.cache.observer2.phpt
diff --git a/tests/Database/Structure.phpt b/tests/Database/Structure.phpt
diff --git a/tests/Database/Structure.schemas.phpt b/tests/Database/Structure.schemas.phpt

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class DatabaseExtension extends Nette\DI\CompilerExtension`
`20`	`20`	`{`
`21`		`- /** @var bool */`
`22`		`- private $debugMode;`
	`21`	`+ private bool $debugMode;`
`23`	`22`
`24`	`23`
`25`	`24`	`public function __construct(bool $debugMode = false)`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ class MsSqlDriver implements Nette\Database\Driver`
`19`	`19`	`{`
`20`	`20`	`use Nette\SmartObject;`
`21`	`21`
`22`		`- /** @var Nette\Database\Connection */`
`23`		`- private $connection;`
	`22`	`+ private Nette\Database\Connection $connection;`
`24`	`23`
`25`	`24`
`26`	`25`	`public function initialize(Nette\Database\Connection $connection, array $options): void`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ class PgSqlDriver implements Nette\Database\Driver`
`19`	`19`	`{`
`20`	`20`	`use Nette\SmartObject;`
`21`	`21`
`22`		`- /** @var Nette\Database\Connection */`
`23`		`- private $connection;`
	`22`	`+ private Nette\Database\Connection $connection;`
`24`	`23`
`25`	`24`
`26`	`25`	`public function initialize(Nette\Database\Connection $connection, array $options): void`