added PHP 7.1 scalar and return type hints

Author: dg

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;
 	}
@@ -62,7 +62,7 @@ public function loadConfiguration()
 	}
 
 
-	private function setupDatabase($config, $name)
+	private function setupDatabase($config, $name): void
 	{
 		$builder = $this->getContainerBuilder();
 

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -49,7 +49,7 @@ public function __construct(Nette\Database\Connection $connection)
 	}
 
 
-	public function logQuery(Nette\Database\Connection $connection, $result)
+	public function logQuery(Nette\Database\Connection $connection, $result): void
 	{
 		if ($this->disabled) {
 			return;
@@ -81,10 +81,10 @@ public function logQuery(Nette\Database\Connection $connection, $result)
 	}
 
 
-	public static function renderException($e)
+	public static function renderException($e): ?array
 	{
 		if (!$e instanceof \PDOException) {
-			return;
+			return NULL;
 		}
 		if (isset($e->queryString)) {
 			$sql = $e->queryString;
@@ -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

@@ -54,8 +54,7 @@ public function __construct($dsn, $user = NULL, $password = NULL, array $options
 	}
 
 
-	/** @return void */
-	public function connect()
+	public function connect(): void
 	{
 		if ($this->pdo) {
 			return;
@@ -78,38 +77,33 @@ public function connect()
 	}
 
 
-	/** @return void */
-	public function reconnect()
+	public function reconnect(): void
 	{
 		$this->disconnect();
 		$this->connect();
 	}
 
 
-	/** @return void */
-	public function disconnect()
+	public function disconnect(): void
 	{
 		$this->pdo = NULL;
 	}
 
 
-	/** @return string */
-	public function getDsn()
+	public function getDsn(): string
 	{
 		return $this->params[0];
 	}
 
 
-	/** @return PDO */
-	public function getPdo()
+	public function getPdo(): PDO
 	{
 		$this->connect();
 		return $this->pdo;
 	}
 
 
-	/** @return ISupplementalDriver */
-	public function getSupplementalDriver()
+	public function getSupplementalDriver(): ISupplementalDriver
 	{
 		$this->connect();
 		return $this->driver;
@@ -118,9 +112,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 +127,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);
@@ -146,33 +138,28 @@ public function quote($string, $type = PDO::PARAM_STR)
 	}
 
 
-	/** @return void */
-	function beginTransaction()
+	function beginTransaction(): void
 	{
 		$this->query('::beginTransaction');
 	}
 
 
-	/** @return void */
-	function commit()
+	function commit(): void
 	{
 		$this->query('::commit');
 	}
 
 
-	/** @return void */
-	public function rollBack()
+	public function rollBack(): void
 	{
 		$this->query('::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 +173,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);
 	}
@@ -199,7 +182,7 @@ public function queryArgs($sql, array $params)
 	/**
 	 * @return [string, array]
 	 */
-	public function preprocess($sql, ...$params)
+	public function preprocess($sql, ...$params): array
 	{
 		$this->connect();
 		return $params
@@ -213,52 +196,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);
 	}