added type hints

dg · dg · commit 3f35235f5c82 · 2018-03-23T15:48:02.000+01:00
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -62,7 +62,7 @@ public function loadConfiguration()
 	}
 
 
-	private function setupDatabase($config, $name): void
+	private function setupDatabase(array $config, string $name): void
 	{
 		$builder = $this->getContainerBuilder();
 
diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -81,7 +81,7 @@ public function logQuery(Nette\Database\Connection $connection, $result): void
 	}
 
 
-	public static function renderException($e): ?array
+	public static function renderException(?\Throwable $e): ?array
 	{
 		if (!$e instanceof \PDOException) {
 			return null;
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -43,7 +43,7 @@ class Connection
 	private $pdo;
 
 
-	public function __construct($dsn, $user = null, $password = null, array $options = null)
+	public function __construct(string $dsn, string $user = null, string $password = null, array $options = null)
 	{
 		$this->params = [$dsn, $user, $password];
 		$this->options = (array) $options;
@@ -175,7 +175,7 @@ public function queryArgs(string $sql, array $params): ResultSet
 	/**
 	 * @return array  [string, array]
 	 */
-	public function preprocess($sql, ...$params): array
+	public function preprocess(string $sql, ...$params): array
 	{
 		$this->connect();
 		return $params
@@ -224,7 +224,7 @@ public function fetchAll(string $sql, ...$params): array
 	}
 
 
-	public static function literal($value, ...$params): SqlLiteral
+	public static function literal(string $value, ...$params): SqlLiteral
 	{
 		return new SqlLiteral($value, $params);
 	}
diff --git a/src/Database/Context.php b/src/Database/Context.php
@@ -145,7 +145,7 @@ public function fetchAll(string $sql, ...$params): array
 	}
 
 
-	public static function literal($value, ...$params): SqlLiteral
+	public static function literal(string $value, ...$params): SqlLiteral
 	{
 		return new SqlLiteral($value, $params);
 	}
diff --git a/src/Database/Conventions/StaticConventions.php b/src/Database/Conventions/StaticConventions.php
@@ -44,7 +44,7 @@ public function __construct(string $primary = 'id', string $foreign = '%s_id', s
 	}
 
 
-	public function getPrimary(string $table)
+	public function getPrimary(string $table): string
 	{
 		return sprintf($this->primary, $this->getColumnFromTable($table));
 	}
diff --git a/src/Database/DriverException.php b/src/Database/DriverException.php
@@ -46,18 +46,12 @@ public function getDriverCode()
 	}
 
 
-	/**
-	 * @return string|null  SQLSTATE error code
-	 */
 	public function getSqlState(): ?string
 	{
 		return $this->errorInfo[0] ?? null;
 	}
 
 
-	/**
-	 * @return string|null  SQL command
-	 */
 	public function getQueryString(): ?string
 	{
 		return $this->queryString;
diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -224,7 +224,7 @@ public static function loadFromFile(Connection $connection, string $file, callab
 	}
 
 
-	public static function createDebugPanel($connection, bool $explain = true, $name = null): Nette\Bridges\DatabaseTracy\ConnectionPanel
+	public static function createDebugPanel($connection, bool $explain = true, string $name = null): Nette\Bridges\DatabaseTracy\ConnectionPanel
 	{
 		$panel = new Nette\Bridges\DatabaseTracy\ConnectionPanel($connection);
 		$panel->explain = $explain;
diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -48,7 +48,7 @@ class ResultSet implements \Iterator, IRowContainer
 	private $types;
 
 
-	public function __construct(Connection $connection, $queryString, array $params)
+	public function __construct(Connection $connection, string $queryString, array $params)
 	{
 		$time = microtime(true);
 		$this->connection = $connection;
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -114,7 +114,7 @@ public function callback(array $m): string
 	}
 
 
-	private function formatValue($value, $mode = null)
+	private function formatValue($value, string $mode = null): string
 	{
 		if (!$mode || $mode === 'auto') {
 			if (is_scalar($value) || is_resource($value)) {
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -238,7 +238,7 @@ protected function analyzePrimaryKey(array $columns)
 	}
 
 
-	protected function analyzeForeignKeys(&$structure, $table): void
+	protected function analyzeForeignKeys(array &$structure, string $table): void
 	{
 		$lowerTable = strtolower($table);
 		foreach ($this->connection->getSupplementalDriver()->getForeignKeys($table) as $row) {
diff --git a/src/Database/Table/ActiveRow.php b/src/Database/Table/ActiveRow.php
@@ -310,7 +310,7 @@ public function accessColumn(string $key, bool $selectColumn = true): bool
 	}
 
 
-	protected function removeAccessColumn($key): void
+	protected function removeAccessColumn(string $key): void
 	{
 		$this->table->removeAccessColumn($key);
 	}
diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
@@ -215,7 +215,7 @@ protected function emptyResultSet(bool $saveCache = true, bool $deleteRererenced
 	/********************* manipulation ****************d*g**/
 
 
-	public function insert($data)
+	public function insert(iterable $data)
 	{
 		if ($data instanceof \Traversable && !$data instanceof Selection) {
 			$data = iterator_to_array($data);
diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -566,19 +566,19 @@ protected function createRow(array $row): ActiveRow
 	}
 
 
-	public function createSelectionInstance($table = null): self
+	public function createSelectionInstance(string $table = null): self
 	{
 		return new self($this->context, $this->conventions, $table ?: $this->name, $this->cache->getStorage());
 	}
 
 
-	protected function createGroupedSelectionInstance($table, $column): GroupedSelection
+	protected function createGroupedSelectionInstance(string $table, string $column): GroupedSelection
 	{
 		return new GroupedSelection($this->context, $this->conventions, $table, $column, $this, $this->cache->getStorage());
 	}
 
 
-	protected function query($query): Nette\Database\ResultSet
+	protected function query(string $query): Nette\Database\ResultSet
 	{
 		return $this->context->queryArgs($query, $this->sqlBuilder->getParameters());
 	}
@@ -736,7 +736,7 @@ protected function refreshData(): void
 	 * @param  array|\Traversable|Selection  $data  array($column => $value)|\Traversable|Selection for INSERT ... SELECT
 	 * @return ActiveRow|int|bool Returns IRow or number of affected rows for Selection or table without primary key
 	 */
-	public function insert($data)
+	public function insert(iterable $data)
 	{
 		if ($data instanceof self) {
 			$return = $this->context->queryArgs($this->sqlBuilder->buildInsertQuery() . ' ' . $data->getSql(), $data->getSqlBuilder()->getParameters());
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -281,7 +281,7 @@ public function addWhere($condition, ...$params): bool
 	}
 
 
-	public function addJoinCondition($tableChain, $condition, ...$params): bool
+	public function addJoinCondition(string $tableChain, $condition, ...$params): bool
 	{
 		$this->parameters['joinConditionSorted'] = null;
 		if (!isset($this->joinCondition[$tableChain])) {
diff --git a/tests/Database/connect.inc.php b/tests/Database/connect.inc.php
@@ -30,7 +30,7 @@
 
 
 /** Replaces [] with driver-specific quotes */
-function reformat($s)
+function reformat($s): string
 {
 	global $driverName;
 	if (is_array($s)) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -31,7 +31,7 @@ function before(\Closure $function = null)
 }
 
 
-function test(\Closure $function)
+function test(\Closure $function): void
 {
 	before();
 	$function();

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function loadConfiguration()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`
`65`		`- private function setupDatabase($config, $name): void`
	`65`	`+ private function setupDatabase(array $config, string $name): void`
`66`	`66`	`{`
`67`	`67`	`$builder = $this->getContainerBuilder();`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function logQuery(Nette\Database\Connection $connection, $result): void`
`81`	`81`	`}`
`82`	`82`
`83`	`83`
`84`		`- public static function renderException($e): ?array`
	`84`	`+ public static function renderException(?\Throwable $e): ?array`
`85`	`85`	`{`
`86`	`86`	`if (!$e instanceof \PDOException) {`
`87`	`87`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class Connection`
`43`	`43`	`private $pdo;`
`44`	`44`
`45`	`45`
`46`		`- public function __construct($dsn, $user = null, $password = null, array $options = null)`
	`46`	`+ public function __construct(string $dsn, string $user = null, string $password = null, array $options = null)`
`47`	`47`	`{`
`48`	`48`	`$this->params = [$dsn, $user, $password];`
`49`	`49`	`$this->options = (array) $options;`
`@@ -175,7 +175,7 @@ public function queryArgs(string $sql, array $params): ResultSet`
`175`	`175`	`/**`
`176`	`176`	`* @return array [string, array]`
`177`	`177`	`*/`
`178`		`- public function preprocess($sql, ...$params): array`
	`178`	`+ public function preprocess(string $sql, ...$params): array`
`179`	`179`	`{`
`180`	`180`	`$this->connect();`
`181`	`181`	`return $params`
`@@ -224,7 +224,7 @@ public function fetchAll(string $sql, ...$params): array`
`224`	`224`	`}`
`225`	`225`
`226`	`226`
`227`		`- public static function literal($value, ...$params): SqlLiteral`
	`227`	`+ public static function literal(string $value, ...$params): SqlLiteral`
`228`	`228`	`{`
`229`	`229`	`return new SqlLiteral($value, $params);`
`230`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function fetchAll(string $sql, ...$params): array`
`145`	`145`	`}`
`146`	`146`
`147`	`147`
`148`		`- public static function literal($value, ...$params): SqlLiteral`
	`148`	`+ public static function literal(string $value, ...$params): SqlLiteral`
`149`	`149`	`{`
`150`	`150`	`return new SqlLiteral($value, $params);`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(string $primary = 'id', string $foreign = '%s_id', s`
`44`	`44`	`}`
`45`	`45`
`46`	`46`
`47`		`- public function getPrimary(string $table)`
	`47`	`+ public function getPrimary(string $table): string`
`48`	`48`	`{`
`49`	`49`	`return sprintf($this->primary, $this->getColumnFromTable($table));`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,18 +46,12 @@ public function getDriverCode()`
`46`	`46`	`}`
`47`	`47`
`48`	`48`
`49`		`- /**`
`50`		`- * @return string\|null SQLSTATE error code`
`51`		`- */`
`52`	`49`	`public function getSqlState(): ?string`
`53`	`50`	`{`
`54`	`51`	`return $this->errorInfo[0] ?? null;`
`55`	`52`	`}`
`56`	`53`
`57`	`54`
`58`		`- /**`
`59`		`- * @return string\|null SQL command`
`60`		`- */`
`61`	`55`	`public function getQueryString(): ?string`
`62`	`56`	`{`
`63`	`57`	`return $this->queryString;`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public static function loadFromFile(Connection $connection, string $file, callab`
`224`	`224`	`}`
`225`	`225`
`226`	`226`
`227`		`- public static function createDebugPanel($connection, bool $explain = true, $name = null): Nette\Bridges\DatabaseTracy\ConnectionPanel`
	`227`	`+ public static function createDebugPanel($connection, bool $explain = true, string $name = null): Nette\Bridges\DatabaseTracy\ConnectionPanel`
`228`	`228`	`{`
`229`	`229`	`$panel = new Nette\Bridges\DatabaseTracy\ConnectionPanel($connection);`
`230`	`230`	`$panel->explain = $explain;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class ResultSet implements \Iterator, IRowContainer`
`48`	`48`	`private $types;`
`49`	`49`
`50`	`50`
`51`		`- public function __construct(Connection $connection, $queryString, array $params)`
	`51`	`+ public function __construct(Connection $connection, string $queryString, array $params)`
`52`	`52`	`{`
`53`	`53`	`$time = microtime(true);`
`54`	`54`	`$this->connection = $connection;`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function callback(array $m): string`
`114`	`114`	`}`
`115`	`115`
`116`	`116`
`117`		`- private function formatValue($value, $mode = null)`
	`117`	`+ private function formatValue($value, string $mode = null): string`
`118`	`118`	`{`
`119`	`119`	`if (!$mode \|\| $mode === 'auto') {`
`120`	`120`	`if (is_scalar($value) \|\| is_resource($value)) {`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ protected function analyzePrimaryKey(array $columns)`
`238`	`238`	`}`
`239`	`239`
`240`	`240`
`241`		`- protected function analyzeForeignKeys(&$structure, $table): void`
	`241`	`+ protected function analyzeForeignKeys(array &$structure, string $table): void`
`242`	`242`	`{`
`243`	`243`	`$lowerTable = strtolower($table);`
`244`	`244`	`foreach ($this->connection->getSupplementalDriver()->getForeignKeys($table) as $row) {`