added PHP 7.1 scalar and return type hints

src/Bridges/DatabaseDI/DatabaseExtension.php

@@ -33,7 +33,7 @@ class DatabaseExtension extends Nette\DI\CompilerExtension
 	private $debugMode;
 
 
-	public function __construct($debugMode = FALSE)
+	public function __construct(bool $debugMode = FALSE)
 	{
 		$this->debugMode = $debugMode;
 	}

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -99,7 +99,7 @@ public static function renderException($e)
 	}
 
 
-	public function getTab()
+	public function getTab(): string
 	{
 		$name = $this->name;
 		$count = $this->count;
@@ -110,11 +110,11 @@ public function getTab()
 	}
 
 
-	public function getPanel()
+	public function getPanel(): ?string
 	{
 		$this->disabled = TRUE;
 		if (!$this->count) {
-			return;
+			return NULL;
 		}
 
 		$name = $this->name;

src/Database/Connection.php

@@ -118,9 +118,8 @@ public function getSupplementalDriver()
 
 	/**
 	 * @param  string  sequence object
-	 * @return string
 	 */
-	public function getInsertId($name = NULL)
+	public function getInsertId(string $name = NULL): string
 	{
 		try {
 			$res = $this->getPdo()->lastInsertId($name);
@@ -134,9 +133,8 @@ public function getInsertId($name = NULL)
 	/**
 	 * @param  string  string to be quoted
 	 * @param  int     data type hint
-	 * @return string
 	 */
-	public function quote($string, $type = PDO::PARAM_STR)
+	public function quote(string $string, int $type = PDO::PARAM_STR): string
 	{
 		try {
 			return $this->getPdo()->quote($string, $type);
@@ -169,10 +167,8 @@ public function rollBack()
 
 	/**
 	 * Generates and executes SQL query.
-	 * @param  string
-	 * @return ResultSet
 	 */
-	public function query($sql, ...$params)
+	public function query(string $sql, ...$params): ResultSet
 	{
 		[$sql, $params] = $this->preprocess($sql, ...$params);
 		try {
@@ -186,11 +182,7 @@ public function query($sql, ...$params)
 	}
 
 
-	/**
-	 * @param  string
-	 * @return ResultSet
-	 */
-	public function queryArgs($sql, array $params)
+	public function queryArgs(string $sql, array $params): ResultSet
 	{
 		return $this->query($sql, ...$params);
 	}
@@ -213,52 +205,42 @@ public function preprocess($sql, ...$params)
 
 	/**
 	 * Shortcut for query()->fetch()
-	 * @param  string
-	 * @return Row|NULL
 	 */
-	public function fetch($sql, ...$params)
+	public function fetch(string $sql, ...$params): ?Row
 	{
 		return $this->query($sql, ...$params)->fetch();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchField()
-	 * @param  string
 	 * @return mixed
 	 */
-	public function fetchField($sql, ...$params)
+	public function fetchField(string $sql, ...$params)
 	{
 		return $this->query($sql, ...$params)->fetchField();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchPairs()
-	 * @param  string
-	 * @return array
 	 */
-	public function fetchPairs($sql, ...$params)
+	public function fetchPairs(string $sql, ...$params): array
 	{
 		return $this->query($sql, ...$params)->fetchPairs();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchAll()
-	 * @param  string
-	 * @return array
 	 */
-	public function fetchAll($sql, ...$params)
+	public function fetchAll(string $sql, ...$params): array
 	{
 		return $this->query($sql, ...$params)->fetchAll();
 	}
 
 
-	/**
-	 * @return SqlLiteral
-	 */
-	public static function literal($value, ...$params)
+	public static function literal($value, ...$params): SqlLiteral
 	{
 		return new SqlLiteral($value, $params);
 	}

src/Database/Context.php

@@ -65,40 +65,29 @@ public function rollBack()
 
 	/**
 	 * @param  string  sequence object
-	 * @return string
 	 */
-	public function getInsertId($name = NULL)
+	public function getInsertId(string $name = NULL): string
 	{
 		return $this->connection->getInsertId($name);
 	}
 
 
 	/**
 	 * Generates and executes SQL query.
-	 * @param  string
-	 * @return ResultSet
 	 */
-	public function query($sql, ...$params)
+	public function query(string $sql, ...$params): ResultSet
 	{
 		return $this->connection->query($sql, ...$params);
 	}
 
 
-	/**
-	 * @param  string
-	 * @return ResultSet
-	 */
-	public function queryArgs($sql, array $params)
+	public function queryArgs(string $sql, array $params): ResultSet
 	{
 		return $this->connection->query($sql, ...$params);
 	}
 
 
-	/**
-	 * @param  string
-	 * @return Table\Selection
-	 */
-	public function table($table)
+	public function table(string $table): Table\Selection
 	{
 		return new Table\Selection($this, $this->conventions, $table, $this->cacheStorage);
 	}
@@ -130,52 +119,42 @@ public function getConventions()
 
 	/**
 	 * Shortcut for query()->fetch()
-	 * @param  string
-	 * @return Row|NULL
 	 */
-	public function fetch($sql, ...$params)
+	public function fetch(string $sql, ...$params): ?Row
 	{
 		return $this->connection->query($sql, ...$params)->fetch();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchField()
-	 * @param  string
 	 * @return mixed
 	 */
-	public function fetchField($sql, ...$params)
+	public function fetchField(string $sql, ...$params)
 	{
 		return $this->connection->query($sql, ...$params)->fetchField();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchPairs()
-	 * @param  string
-	 * @return array
 	 */
-	public function fetchPairs($sql, ...$params)
+	public function fetchPairs(string $sql, ...$params): array
 	{
 		return $this->connection->query($sql, ...$params)->fetchPairs();
 	}
 
 
 	/**
 	 * Shortcut for query()->fetchAll()
-	 * @param  string
-	 * @return array
 	 */
-	public function fetchAll($sql, ...$params)
+	public function fetchAll(string $sql, ...$params): array
 	{
 		return $this->connection->query($sql, ...$params)->fetchAll();
 	}
 
 
-	/**
-	 * @return SqlLiteral
-	 */
-	public static function literal($value, ...$params)
+	public static function literal($value, ...$params): SqlLiteral
 	{
 		return new SqlLiteral($value, $params);
 	}

src/Database/Conventions/DiscoveredConventions.php

@@ -28,13 +28,13 @@ public function __construct(IStructure $structure)
 	}
 
 
-	public function getPrimary($table)
+	public function getPrimary(string $table)
 	{
 		return $this->structure->getPrimaryKey($table);
 	}
 
 
-	public function getHasManyReference($nsTable, $key)
+	public function getHasManyReference(string $nsTable, string $key): ?array
 	{
 		$candidates = $columnCandidates = [];
 		$targets = $this->structure->getHasManyReference($nsTable);
@@ -83,7 +83,7 @@ public function getHasManyReference($nsTable, $key)
 	}
 
 
-	public function getBelongsToReference($table, $key)
+	public function getBelongsToReference(string $table, string $key): ?array
 	{
 		$tableColumns = $this->structure->getBelongsToReference($table);
 

src/Database/Conventions/StaticConventions.php

@@ -36,21 +36,21 @@ class StaticConventions implements IConventions
 	 * @param  string %1$s stands for key used after ->, %2$s for table name
 	 * @param  string %1$s stands for key used after ->, %2$s for table name
 	 */
-	public function __construct($primary = 'id', $foreign = '%s_id', $table = '%s')
+	public function __construct(string $primary = 'id', string $foreign = '%s_id', string $table = '%s')
 	{
 		$this->primary = $primary;
 		$this->foreign = $foreign;
 		$this->table = $table;
 	}
 
 
-	public function getPrimary($table)
+	public function getPrimary(string $table)
 	{
 		return sprintf($this->primary, $this->getColumnFromTable($table));
 	}
 
 
-	public function getHasManyReference($table, $key)
+	public function getHasManyReference(string $table, string $key): ?array
 	{
 		$table = $this->getColumnFromTable($table);
 		return [
@@ -60,7 +60,7 @@ public function getHasManyReference($table, $key)
 	}
 
 
-	public function getBelongsToReference($table, $key)
+	public function getBelongsToReference(string $table, string $key): ?array
 	{
 		$table = $this->getColumnFromTable($table);
 		return [
@@ -70,7 +70,7 @@ public function getBelongsToReference($table, $key)
 	}
 
 
-	protected function getColumnFromTable($name)
+	protected function getColumnFromTable(string $name)
 	{
 		if ($this->table !== '%s' && preg_match('(^' . str_replace('%s', '(.*)', preg_quote($this->table)) . '\z)', $name, $match)) {
 			return $match[1];

src/Database/DriverException.php

@@ -49,7 +49,7 @@ public function getDriverCode()
 	/**
 	 * @return string|NULL  SQLSTATE error code
 	 */
-	public function getSqlState()
+	public function getSqlState(): ?string
 	{
 		return $this->errorInfo[0] ?? NULL;
 	}
@@ -58,7 +58,7 @@ public function getSqlState()
 	/**
 	 * @return string|NULL  SQL command
 	 */
-	public function getQueryString()
+	public function getQueryString(): ?string
 	{
 		return $this->queryString;
 	}