Skip to content

Commit 13bc0e9

Browse files
dgdg
committed
added PHP 7.1 scalar and return type hints
1 parent 03cb6dc commit 13bc0e9

34 files changed

+327
-680
lines changed

‎src/Bridges/DatabaseDI/DatabaseExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DatabaseExtension extends Nette\DI\CompilerExtension
3333
private $debugMode;
3434

3535

36-
public function __construct($debugMode = FALSE)
36+
public function __construct(bool $debugMode = FALSE)
3737
{
3838
$this->debugMode = $debugMode;
3939
}

‎src/Bridges/DatabaseTracy/ConnectionPanel.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static function renderException($e)
9999
}
100100

101101

102-
public function getTab()
102+
public function getTab(): string
103103
{
104104
$name = $this->name;
105105
$count = $this->count;
@@ -110,11 +110,11 @@ public function getTab()
110110
}
111111

112112

113-
public function getPanel()
113+
public function getPanel(): ?string
114114
{
115115
$this->disabled = TRUE;
116116
if (!$this->count) {
117-
return;
117+
return NULL;
118118
}
119119

120120
$name = $this->name;

‎src/Database/Connection.php‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,8 @@ public function getSupplementalDriver()
118118

119119
/**
120120
* @param string sequence object
121-
* @return string
122121
*/
123-
public function getInsertId($name = NULL)
122+
public function getInsertId(string $name = NULL): string
124123
{
125124
try {
126125
$res = $this->getPdo()->lastInsertId($name);
@@ -134,9 +133,8 @@ public function getInsertId($name = NULL)
134133
/**
135134
* @param string string to be quoted
136135
* @param int data type hint
137-
* @return string
138136
*/
139-
public function quote($string, $type = PDO::PARAM_STR)
137+
public function quote(string $string, int $type = PDO::PARAM_STR): string
140138
{
141139
try {
142140
return $this->getPdo()->quote($string, $type);
@@ -169,10 +167,8 @@ public function rollBack()
169167

170168
/**
171169
* Generates and executes SQL query.
172-
* @param string
173-
* @return ResultSet
174170
*/
175-
public function query($sql, ...$params)
171+
public function query(string $sql, ...$params): ResultSet
176172
{
177173
[$sql, $params] = $this->preprocess($sql, ...$params);
178174
try {
@@ -186,11 +182,7 @@ public function query($sql, ...$params)
186182
}
187183

188184

189-
/**
190-
* @param string
191-
* @return ResultSet
192-
*/
193-
public function queryArgs($sql, array $params)
185+
public function queryArgs(string $sql, array $params): ResultSet
194186
{
195187
return $this->query($sql, ...$params);
196188
}
@@ -213,52 +205,42 @@ public function preprocess($sql, ...$params)
213205

214206
/**
215207
* Shortcut for query()->fetch()
216-
* @param string
217-
* @return Row|NULL
218208
*/
219-
public function fetch($sql, ...$params)
209+
public function fetch(string $sql, ...$params): ?Row
220210
{
221211
return $this->query($sql, ...$params)->fetch();
222212
}
223213

224214

225215
/**
226216
* Shortcut for query()->fetchField()
227-
* @param string
228217
* @return mixed
229218
*/
230-
public function fetchField($sql, ...$params)
219+
public function fetchField(string $sql, ...$params)
231220
{
232221
return $this->query($sql, ...$params)->fetchField();
233222
}
234223

235224

236225
/**
237226
* Shortcut for query()->fetchPairs()
238-
* @param string
239-
* @return array
240227
*/
241-
public function fetchPairs($sql, ...$params)
228+
public function fetchPairs(string $sql, ...$params): array
242229
{
243230
return $this->query($sql, ...$params)->fetchPairs();
244231
}
245232

246233

247234
/**
248235
* Shortcut for query()->fetchAll()
249-
* @param string
250-
* @return array
251236
*/
252-
public function fetchAll($sql, ...$params)
237+
public function fetchAll(string $sql, ...$params): array
253238
{
254239
return $this->query($sql, ...$params)->fetchAll();
255240
}
256241

257242

258-
/**
259-
* @return SqlLiteral
260-
*/
261-
public static function literal($value, ...$params)
243+
public static function literal($value, ...$params): SqlLiteral
262244
{
263245
return new SqlLiteral($value, $params);
264246
}

‎src/Database/Context.php‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -65,40 +65,29 @@ public function rollBack()
6565

6666
/**
6767
* @param string sequence object
68-
* @return string
6968
*/
70-
public function getInsertId($name = NULL)
69+
public function getInsertId(string $name = NULL): string
7170
{
7271
return $this->connection->getInsertId($name);
7372
}
7473

7574

7675
/**
7776
* Generates and executes SQL query.
78-
* @param string
79-
* @return ResultSet
8077
*/
81-
public function query($sql, ...$params)
78+
public function query(string $sql, ...$params): ResultSet
8279
{
8380
return $this->connection->query($sql, ...$params);
8481
}
8582

8683

87-
/**
88-
* @param string
89-
* @return ResultSet
90-
*/
91-
public function queryArgs($sql, array $params)
84+
public function queryArgs(string $sql, array $params): ResultSet
9285
{
9386
return $this->connection->query($sql, ...$params);
9487
}
9588

9689

97-
/**
98-
* @param string
99-
* @return Table\Selection
100-
*/
101-
public function table($table)
90+
public function table(string $table): Table\Selection
10291
{
10392
return new Table\Selection($this, $this->conventions, $table, $this->cacheStorage);
10493
}
@@ -130,52 +119,42 @@ public function getConventions()
130119

131120
/**
132121
* Shortcut for query()->fetch()
133-
* @param string
134-
* @return Row|NULL
135122
*/
136-
public function fetch($sql, ...$params)
123+
public function fetch(string $sql, ...$params): ?Row
137124
{
138125
return $this->connection->query($sql, ...$params)->fetch();
139126
}
140127

141128

142129
/**
143130
* Shortcut for query()->fetchField()
144-
* @param string
145131
* @return mixed
146132
*/
147-
public function fetchField($sql, ...$params)
133+
public function fetchField(string $sql, ...$params)
148134
{
149135
return $this->connection->query($sql, ...$params)->fetchField();
150136
}
151137

152138

153139
/**
154140
* Shortcut for query()->fetchPairs()
155-
* @param string
156-
* @return array
157141
*/
158-
public function fetchPairs($sql, ...$params)
142+
public function fetchPairs(string $sql, ...$params): array
159143
{
160144
return $this->connection->query($sql, ...$params)->fetchPairs();
161145
}
162146

163147

164148
/**
165149
* Shortcut for query()->fetchAll()
166-
* @param string
167-
* @return array
168150
*/
169-
public function fetchAll($sql, ...$params)
151+
public function fetchAll(string $sql, ...$params): array
170152
{
171153
return $this->connection->query($sql, ...$params)->fetchAll();
172154
}
173155

174156

175-
/**
176-
* @return SqlLiteral
177-
*/
178-
public static function literal($value, ...$params)
157+
public static function literal($value, ...$params): SqlLiteral
179158
{
180159
return new SqlLiteral($value, $params);
181160
}

‎src/Database/Conventions/DiscoveredConventions.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public function __construct(IStructure $structure)
2828
}
2929

3030

31-
public function getPrimary($table)
31+
public function getPrimary(string $table)
3232
{
3333
return $this->structure->getPrimaryKey($table);
3434
}
3535

3636

37-
public function getHasManyReference($nsTable, $key)
37+
public function getHasManyReference(string $nsTable, string $key): ?array
3838
{
3939
$candidates = $columnCandidates = [];
4040
$targets = $this->structure->getHasManyReference($nsTable);
@@ -83,7 +83,7 @@ public function getHasManyReference($nsTable, $key)
8383
}
8484

8585

86-
public function getBelongsToReference($table, $key)
86+
public function getBelongsToReference(string $table, string $key): ?array
8787
{
8888
$tableColumns = $this->structure->getBelongsToReference($table);
8989

‎src/Database/Conventions/StaticConventions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ class StaticConventions implements IConventions
3636
* @param string %1$s stands for key used after ->, %2$s for table name
3737
* @param string %1$s stands for key used after ->, %2$s for table name
3838
*/
39-
public function __construct($primary = 'id', $foreign = '%s_id', $table = '%s')
39+
public function __construct(string $primary = 'id', string $foreign = '%s_id', string $table = '%s')
4040
{
4141
$this->primary = $primary;
4242
$this->foreign = $foreign;
4343
$this->table = $table;
4444
}
4545

4646

47-
public function getPrimary($table)
47+
public function getPrimary(string $table)
4848
{
4949
return sprintf($this->primary, $this->getColumnFromTable($table));
5050
}
5151

5252

53-
public function getHasManyReference($table, $key)
53+
public function getHasManyReference(string $table, string $key): ?array
5454
{
5555
$table = $this->getColumnFromTable($table);
5656
return [
@@ -60,7 +60,7 @@ public function getHasManyReference($table, $key)
6060
}
6161

6262

63-
public function getBelongsToReference($table, $key)
63+
public function getBelongsToReference(string $table, string $key): ?array
6464
{
6565
$table = $this->getColumnFromTable($table);
6666
return [
@@ -70,7 +70,7 @@ public function getBelongsToReference($table, $key)
7070
}
7171

7272

73-
protected function getColumnFromTable($name)
73+
protected function getColumnFromTable(string $name)
7474
{
7575
if ($this->table !== '%s' && preg_match('(^' . str_replace('%s', '(.*)', preg_quote($this->table)) . '\z)', $name, $match)) {
7676
return $match[1];

‎src/Database/DriverException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function getDriverCode()
4949
/**
5050
* @return string|NULL SQLSTATE error code
5151
*/
52-
public function getSqlState()
52+
public function getSqlState(): ?string
5353
{
5454
return $this->errorInfo[0] ?? NULL;
5555
}
@@ -58,7 +58,7 @@ public function getSqlState()
5858
/**
5959
* @return string|NULL SQL command
6060
*/
61-
public function getQueryString()
61+
public function getQueryString(): ?string
6262
{
6363
return $this->queryString;
6464
}

0 commit comments

Comments
 (0)