Skip to content

Commit 056edd2

Browse files
committed
added missing typehints
1 parent 47cdcf9 commit 056edd2

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/Database/Connection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ class Connection
2121
{
2222
use Nette\SmartObject;
2323

24-
/** @var callable[] function (Connection $connection); Occurs after connection is established */
24+
/** @var callable[] function (Connection $connection): void; Occurs after connection is established */
2525
public $onConnect;
2626

27-
/** @var callable[] function (Connection $connection, ResultSet|DriverException $result); Occurs after query is executed */
27+
/** @var callable[] function (Connection $connection, ResultSet|DriverException $result): void; Occurs after query is executed */
2828
public $onQuery;
2929

3030
/** @var array */

src/Database/Helpers.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static function dumpSql(string $sql, array $params = null, Connection $co
9898

9999
// syntax highlight
100100
$sql = htmlspecialchars($sql, ENT_IGNORE, 'UTF-8');
101-
$sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", function ($matches) {
101+
$sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", function (array $matches) {
102102
if (!empty($matches[1])) { // comment
103103
return '<em style="color:gray">' . $matches[1] . '</em>';
104104

@@ -114,7 +114,7 @@ public static function dumpSql(string $sql, array $params = null, Connection $co
114114
}, $sql);
115115

116116
// parameters
117-
$sql = preg_replace_callback('#\?#', function () use ($params, $connection) {
117+
$sql = preg_replace_callback('#\?#', function () use ($params, $connection): string {
118118
static $i = 0;
119119
if (!isset($params[$i])) {
120120
return '?';

src/Database/Structure.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function loadStructure(): array
207207

208208
if (isset($structure['hasMany'])) {
209209
foreach ($structure['hasMany'] as &$table) {
210-
uksort($table, function ($a, $b) {
210+
uksort($table, function ($a, $b): int {
211211
return strlen($a) <=> strlen($b);
212212
});
213213
}
@@ -247,7 +247,7 @@ protected function analyzeForeignKeys(array &$structure, string $table): void
247247
}
248248

249249
if (isset($structure['belongsTo'][$lowerTable])) {
250-
uksort($structure['belongsTo'][$lowerTable], function ($a, $b) {
250+
uksort($structure['belongsTo'][$lowerTable], function ($a, $b): int {
251251
return strlen($a) <=> strlen($b);
252252
});
253253
}

src/Database/Table/SqlBuilder.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ protected function parseJoinConditions(&$joins, $joinConditions): array
536536
$tableAlias = substr($fooQuery, 0, -4);
537537
$tableJoins[$tableAlias] = $requiredJoins;
538538
$leftJoinDependency[$tableAlias] = [];
539-
$finalJoinConditions[$tableAlias] = preg_replace_callback($this->getColumnChainsRegxp(), function ($match) use ($tableAlias, &$tableJoins, &$leftJoinDependency) {
539+
$finalJoinConditions[$tableAlias] = preg_replace_callback($this->getColumnChainsRegxp(), function (array $match) use ($tableAlias, &$tableJoins, &$leftJoinDependency): string {
540540
$requiredJoins = [];
541541
$query = $this->parseJoinsCb($requiredJoins, $match);
542542
$queryParts = explode('.', $query);
@@ -562,7 +562,7 @@ protected function parseJoinConditions(&$joins, $joinConditions): array
562562
protected function getSortedJoins(string $table, &$leftJoinDependency, &$tableJoins, &$finalJoins): void
563563
{
564564
if (isset($this->expandingJoins[$table])) {
565-
$path = implode("' => '", array_map(function ($value) { return $this->reservedTableNames[$value]; }, array_merge(array_keys($this->expandingJoins), [$table])));
565+
$path = implode("' => '", array_map(function (string $value): string { return $this->reservedTableNames[$value]; }, array_merge(array_keys($this->expandingJoins), [$table])));
566566
throw new Nette\InvalidArgumentException("Circular reference detected at left join conditions (tables '$path').");
567567
}
568568
if (isset($tableJoins[$table])) {
@@ -595,7 +595,7 @@ protected function getSortedJoins(string $table, &$leftJoinDependency, &$tableJo
595595

596596
protected function parseJoins(&$joins, &$query): void
597597
{
598-
$query = preg_replace_callback($this->getColumnChainsRegxp(), function ($match) use (&$joins) {
598+
$query = preg_replace_callback($this->getColumnChainsRegxp(), function (array $match) use (&$joins): string {
599599
return $this->parseJoinsCb($joins, $match);
600600
}, $query);
601601
}
@@ -767,7 +767,7 @@ protected function buildQueryEnd(): string
767767

768768
protected function tryDelimite(string $s): string
769769
{
770-
return preg_replace_callback('#(?<=[^\w`"\[?:]|^)[a-z_][a-z0-9_]*(?=[^\w`"(\]]|\z)#i', function ($m) {
770+
return preg_replace_callback('#(?<=[^\w`"\[?:]|^)[a-z_][a-z0-9_]*(?=[^\w`"(\]]|\z)#i', function (array $m): string {
771771
return strtoupper($m[0]) === $m[0] ? $m[0] : $this->driver->delimite($m[0]);
772772
}, $s);
773773
}
@@ -805,7 +805,7 @@ private function getConditionHash($condition, array $parameters): string
805805
private function getCachedTableList(): array
806806
{
807807
if (!$this->cacheTableList) {
808-
$this->cacheTableList = array_flip(array_map(function ($pair) {
808+
$this->cacheTableList = array_flip(array_map(function (array $pair): string {
809809
return $pair['fullName'] ?? $pair['name'];
810810
}, $this->structure->getTables()));
811811
}

0 commit comments

Comments
 (0)