fixed bugs reported by PHPStan

Author: dg

src/Bridges/DatabaseDI/DatabaseExtension.php

@@ -106,7 +106,7 @@ private function setupDatabase(\stdClass $config, string $name): void
 				->setAutowired($config->autowired);
 
 		} else {
-			$conventions = Nette\DI\Config\Processor::processArguments([$config['conventions']])[0];
+			$conventions = Nette\DI\Helpers::filterArguments([$config->conventions])[0];
 		}
 
 		$builder->addDefinition($this->prefix("$name.context"))

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -34,7 +34,7 @@ class ConnectionPanel implements Tracy\IBarPanel
 	/** @var bool */
 	public $disabled = false;
 
-	/** @var int logged time */
+	/** @var float logged time */
 	private $totalTime = 0;
 
 	/** @var int */

src/Database/Connection.php

@@ -39,7 +39,7 @@ class Connection
 	/** @var SqlPreprocessor */
 	private $preprocessor;
 
-	/** @var PDO */
+	/** @var PDO|null */
 	private $pdo;
 
 	/** @var string|null */
@@ -199,7 +199,7 @@ public function getLastQueryString(): ?string
 	/**
 	 * Shortcut for query()->fetch()
 	 */
-	public function fetch(string $sql, ...$params): ?Row
+	public function fetch(string $sql, ...$params): ?IRow
 	{
 		return $this->query($sql, ...$params)->fetch();
 	}

src/Database/Context.php

@@ -111,7 +111,7 @@ public function getConventions(): IConventions
 	/**
 	 * Shortcut for query()->fetch()
 	 */
-	public function fetch(string $sql, ...$params): ?Row
+	public function fetch(string $sql, ...$params): ?IRow
 	{
 		return $this->connection->query($sql, ...$params)->fetch();
 	}

src/Database/ResultSet.php

@@ -26,7 +26,7 @@ class ResultSet implements \Iterator, IRowContainer
 	/** @var \PDOStatement|null */
 	private $pdoStatement;
 
-	/** @var IRow */
+	/** @var IRow|false */
 	private $result;
 
 	/** @var int */

src/Database/SqlPreprocessor.php

@@ -60,7 +60,7 @@ class SqlPreprocessor
 	/** @var bool */
 	private $useParams;
 
-	/** @var string values|set|and|order */
+	/** @var string|null values|set|and|order */
 	private $arrayMode;
 
 

src/Database/Table/ActiveRow.php

@@ -62,6 +62,7 @@ public function __toString()
 				throw $e;
 			}
 			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
+			return '';
 		}
 	}
 

src/Database/Table/Selection.php

@@ -58,23 +58,23 @@ class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 	/** @var mixed */
 	protected $refCache;
 
-	/** @var string */
+	/** @var string|null */
 	protected $generalCacheKey;
 
-	/** @var string */
+	/** @var string|null */
 	protected $specificCacheKey;
 
 	/** @var array of [conditions => [key => IRow]]; used by GroupedSelection */
 	protected $aggregation = [];
 
-	/** @var array of touched columns */
+	/** @var array|false|null of touched columns */
 	protected $accessedColumns;
 
-	/** @var array of earlier touched columns */
+	/** @var array|false|null of earlier touched columns */
 	protected $previousAccessedColumns;
 
-	/** @var bool should instance observe accessed columns caching */
-	protected $observeCache = false;
+	/** @var self|null should instance observe accessed columns caching */
+	protected $observeCache;
 
 	/** @var array of primary key values */
 	protected $keys = [];