From 0d5fd9d65b6421d871834dbc5026835b06da7313 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 17 Apr 2018 10:38:07 +0200
Subject: [PATCH] type fixes

---
 src/Dibi/Bridges/Tracy/Panel.php   | 2 +-
 src/Dibi/Connection.php            | 4 ++--
 src/Dibi/DataSource.php            | 6 +++---
 src/Dibi/Drivers/MySqliDriver.php  | 2 +-
 src/Dibi/Drivers/PdoDriver.php     | 4 ++--
 src/Dibi/Drivers/Sqlite3Driver.php | 2 +-
 src/Dibi/Event.php                 | 4 ++--
 src/Dibi/Fluent.php                | 4 ++--
 src/Dibi/Helpers.php               | 2 +-
 src/Dibi/Loggers/FirePhpLogger.php | 2 +-
 src/Dibi/Reflection/Database.php   | 4 ++--
 src/Dibi/Result.php                | 6 +++---
 src/Dibi/Row.php                   | 2 +-
 src/Dibi/Translator.php            | 4 ++--
 src/Dibi/dibi.php                  | 8 ++++----
 src/Dibi/exceptions.php            | 2 +-
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php
index aea20ee2..0f208101 100644
--- a/src/Dibi/Bridges/Tracy/Panel.php
+++ b/src/Dibi/Bridges/Tracy/Panel.php
@@ -23,7 +23,7 @@ class Panel implements Tracy\IBarPanel
 	/** @var int maximum SQL length */
 	public static $maxLength = 1000;
 
-	/** @var bool  explain queries? */
+	/** @var bool|string  explain queries? */
 	public $explain;
 
 	/** @var int */
diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index b5531b18..d86d808f 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -29,7 +29,7 @@ class Connection
 	/** @var Driver */
 	private $driver;
 
-	/** @var Translator */
+	/** @var Translator|null */
 	private $translator;
 
 	/** @var bool  Is connected? */
@@ -559,7 +559,7 @@ class Connection
 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
 	 * @param  array|mixed    one or more arguments
-	 * @return Row[]
+	 * @return Row[]|array[]
 	 * @throws Exception
 	 */
 	public function fetchAll($args)
diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php
index d9f10218..d855845c 100644
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -21,13 +21,13 @@ class DataSource implements IDataSource
 	/** @var string */
 	private $sql;
 
-	/** @var Result */
+	/** @var Result|null */
 	private $result;
 
-	/** @var int */
+	/** @var int|null */
 	private $count;
 
-	/** @var int */
+	/** @var int|null */
 	private $totalCount;
 
 	/** @var array */
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php
index 75b6e37e..ef2503d5 100644
--- a/src/Dibi/Drivers/MySqliDriver.php
+++ b/src/Dibi/Drivers/MySqliDriver.php
@@ -256,7 +256,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return \mysqli
+	 * @return \mysqli|null
 	 */
 	public function getResource()
 	{
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php
index fcefa38b..2d1a394e 100644
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PdoDriver.php
@@ -27,7 +27,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var PDO  Connection resource */
+	/** @var PDO|null  Connection resource */
 	private $connection;
 
 	/** @var \PDOStatement|null  Resultset resource */
@@ -200,7 +200,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return PDO
+	 * @return PDO|null
 	 */
 	public function getResource()
 	{
diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php
index b54f2834..1c2a650d 100644
--- a/src/Dibi/Drivers/Sqlite3Driver.php
+++ b/src/Dibi/Drivers/Sqlite3Driver.php
@@ -214,7 +214,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return SQLite3
+	 * @return SQLite3|null
 	 */
 	public function getResource()
 	{
diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php
index 0eb4699a..ae5dfa7d 100644
--- a/src/Dibi/Event.php
+++ b/src/Dibi/Event.php
@@ -43,7 +43,7 @@ class Event
 	/** @var float */
 	public $time;
 
-	/** @var int */
+	/** @var int|null */
 	public $count;
 
 	/** @var array */
@@ -74,7 +74,7 @@ class Event
 			}
 		}
 
-		\dibi::$elapsedTime = false;
+		\dibi::$elapsedTime = null;
 		\dibi::$numOfQueries++;
 		\dibi::$sql = $sql;
 	}
diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php
index 90e9f924..fd4724d1 100644
--- a/src/Dibi/Fluent.php
+++ b/src/Dibi/Fluent.php
@@ -13,7 +13,7 @@ namespace Dibi;
  *
  * @method Fluent select(...$field)
  * @method Fluent distinct()
- * @method Fluent from($table)
+ * @method Fluent from($table, ...$args)
  * @method Fluent where(...$cond)
  * @method Fluent groupBy(...$field)
  * @method Fluent having(...$cond)
@@ -95,7 +95,7 @@ class Fluent implements IDataSource
 	/** @var array */
 	private $flags = [];
 
-	/** @var array */
+	/** @var array|null */
 	private $cursor;
 
 	/** @var HashMap  normalized clauses */
diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php
index c2b094d3..b55ea411 100644
--- a/src/Dibi/Helpers.php
+++ b/src/Dibi/Helpers.php
@@ -12,7 +12,7 @@ class Helpers
 {
 	use Strict;
 
-	/** @var array */
+	/** @var HashMap */
 	private static $types;
 
 
diff --git a/src/Dibi/Loggers/FirePhpLogger.php b/src/Dibi/Loggers/FirePhpLogger.php
index deee24e4..40337fc5 100644
--- a/src/Dibi/Loggers/FirePhpLogger.php
+++ b/src/Dibi/Loggers/FirePhpLogger.php
@@ -29,7 +29,7 @@ class FirePhpLogger
 	/** @var int */
 	public $filter;
 
-	/** @var int  Elapsed time for all queries */
+	/** @var float  Elapsed time for all queries */
 	public $totalTime = 0;
 
 	/** @var int  Number of all queries */
diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php
index 9e2a07b5..c34bee73 100644
--- a/src/Dibi/Reflection/Database.php
+++ b/src/Dibi/Reflection/Database.php
@@ -24,7 +24,7 @@ class Database
 	/** @var Dibi\Reflector */
 	private $reflector;
 
-	/** @var string */
+	/** @var string|null */
 	private $name;
 
 	/** @var array */
@@ -39,7 +39,7 @@ class Database
 
 
 	/**
-	 * @return string
+	 * @return string|null
 	 */
 	public function getName()
 	{
diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php
index 9be89174..d3afc439 100644
--- a/src/Dibi/Result.php
+++ b/src/Dibi/Result.php
@@ -42,10 +42,10 @@ class Result implements IDataSource
 	/** @var bool  Already fetched? Used for allowance for first seek(0) */
 	private $fetched = false;
 
-	/** @var string  returned object class */
+	/** @var string|null  returned object class */
 	private $rowClass = 'Dibi\Row';
 
-	/** @var callable  returned object factory*/
+	/** @var callable|null  returned object factory */
 	private $rowFactory;
 
 	/** @var array  format */
@@ -225,7 +225,7 @@ class Result implements IDataSource
 	 * Fetches all records from table.
 	 * @param  int  offset
 	 * @param  int  limit
-	 * @return Row[]
+	 * @return Row[]|array[]
 	 */
 	final public function fetchAll($offset = null, $limit = null)
 	{
diff --git a/src/Dibi/Row.php b/src/Dibi/Row.php
index b175ae4c..ad51349b 100644
--- a/src/Dibi/Row.php
+++ b/src/Dibi/Row.php
@@ -31,7 +31,7 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	 * Converts value to DateTime object.
 	 * @param  string key
 	 * @param  string format
-	 * @return \DateTime
+	 * @return DateTime|string|null
 	 */
 	public function asDateTime($key, $format = null)
 	{
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index f7d87e83..1b337e44 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -39,10 +39,10 @@ final class Translator
 	/** @var int */
 	private $ifLevelStart = 0;
 
-	/** @var int */
+	/** @var int|null */
 	private $limit;
 
-	/** @var int */
+	/** @var int|null */
 	private $offset;
 
 	/** @var HashMap */
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index 2a085a33..7d34f8bf 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -49,13 +49,13 @@ class dibi
 		FIELD_DATETIME = Type::DATETIME,
 		FIELD_TIME = Type::TIME;
 
-	/** @var string  Last SQL command @see dibi::query() */
+	/** @var string|null  Last SQL command @see dibi::query() */
 	public static $sql;
 
-	/** @var int  Elapsed time for last query */
+	/** @var float|null  Elapsed time for last query */
 	public static $elapsedTime;
 
-	/** @var int  Elapsed time for all queries */
+	/** @var float  Elapsed time for all queries */
 	public static $totalTime;
 
 	/** @var int  Number or queries */
@@ -441,7 +441,7 @@ class dibi
 	 * Prints out a syntax highlighted version of the SQL command or Result.
 	 * @param  string|Result
 	 * @param  bool  return output instead of printing it?
-	 * @return string
+	 * @return string|null
 	 */
 	public static function dump($sql = null, $return = false)
 	{
diff --git a/src/Dibi/exceptions.php b/src/Dibi/exceptions.php
index beb1dba7..0d8c490b 100644
--- a/src/Dibi/exceptions.php
+++ b/src/Dibi/exceptions.php
@@ -104,7 +104,7 @@ class ProcedureException extends Exception
 	 * @param  int     Some code
 	 * @param  string SQL command
 	 */
-	public function __construct($message = null, $code = 0, $severity = null, $sql = null)
+	public function __construct($message = '', $code = 0, $severity = '', $sql = null)
 	{
 		parent::__construct($message, (int) $code, $sql);
 		$this->severity = $severity;