strict type fixes

Author: dg

src/Database/DriverException.php

@@ -22,7 +22,7 @@ class DriverException extends \PDOException
 	 */
 	public static function from(\PDOException $src)
 	{
-		$e = new static($src->message, NULL, $src);
+		$e = new static($src->message, 0, $src);
 		if (!$src->errorInfo && preg_match('#SQLSTATE\[(.*?)\] \[(.*?)\] (.*)#A', $src->message, $m)) {
 			$m[2] = (int) $m[2];
 			$e->errorInfo = array_slice($m, 1);

src/Database/Drivers/SqliteDriver.php

@@ -189,7 +189,7 @@ public function getColumns($table)
 				'unsigned' => FALSE,
 				'nullable' => $row['notnull'] == '0',
 				'default' => $row['dflt_value'],
-				'autoincrement' => (bool) preg_match($pattern, $meta['sql']),
+				'autoincrement' => (bool) preg_match($pattern, (string) $meta['sql']),
 				'primary' => $row['pk'] > 0,
 				'vendor' => (array) $row,
 			];

src/Database/Drivers/SqlsrvDriver.php

@@ -97,7 +97,7 @@ public function applyLimit(&$sql, $limit, $offset)
 		if ($limit < 0 || $offset < 0) {
 			throw new Nette\InvalidArgumentException('Negative offset or limit.');
 
-		} elseif (version_compare($this->version, 11, '<')) { // 11 == SQL Server 2012
+		} elseif (version_compare($this->version, '11', '<')) { // 11 == SQL Server 2012
 			if ($offset) {
 				throw new Nette\NotSupportedException('Offset is not supported by this database.');
 

src/Database/Helpers.php

@@ -132,7 +132,7 @@ public static function dumpSql($sql, array $params = NULL, Connection $connectio
 					. '>&lt;' . htmlSpecialChars($type, ENT_NOQUOTES, 'UTF-8') . ' resource&gt;</i> ';
 
 			} else {
-				return htmlspecialchars($param, ENT_NOQUOTES, 'UTF-8');
+				return htmlspecialchars((string) $param, ENT_NOQUOTES, 'UTF-8');
 			}
 		}, $sql);
 
@@ -197,7 +197,7 @@ public static function loadFromFile(Connection $connection, $file)
 		$sql = '';
 		$pdo = $connection->getPdo(); // native query without logging
 		while (!feof($handle)) {
-			$s = rtrim(fgets($handle));
+			$s = rtrim((string) fgets($handle));
 			if (!strncasecmp($s, 'DELIMITER ', 10)) {
 				$delimiter = substr($s, 10);
 

tests/Database/Drivers/SqlsrvDriver.applyLimit.phpt

@@ -7,6 +7,9 @@ require __DIR__ . '/../../bootstrap.php';
 
 $rc = new ReflectionClass(Nette\Database\Drivers\SqlsrvDriver::class);
 $driver = $rc->newInstanceWithoutConstructor();
+$version = $rc->getProperty('version');
+$version->setAccessible(TRUE);
+$version->setValue($driver, '10');
 
 Assert::exception(function () use ($driver) {
 	$query = 'SELECT 1 FROM t';
@@ -50,9 +53,7 @@ Assert::exception(function () use ($driver) {
 
 
 
-$version = $rc->getProperty('version');
-$version->setAccessible(TRUE);
-$version->setValue($driver, 12);
+$version->setValue($driver, '11');
 
 $query = 'SELECT 1 FROM t';
 $driver->applyLimit($query, 10, 20);