Skip to content

Commit dd66c09

Browse files
committed
used PhpStorm Language attribute
1 parent 0da02bc commit dd66c09

File tree

3 files changed

+76
-15
lines changed

3 files changed

+76
-15
lines changed

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"php": "7.2 - 8.3",
1919
"ext-pdo": "*",
2020
"nette/caching": "^3.0",
21-
"nette/utils": "^3.2.1 || ~4.0.0"
21+
"nette/utils": "^3.2.1 || ~4.0.0",
22+
"jetbrains/phpstorm-attributes": "dev-master"
2223
},
2324
"require-dev": {
2425
"nette/tester": "^2.4",

src/Database/Connection.php

+37-7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Nette\Database;
1111

12+
use JetBrains\PhpStorm\Language;
1213
use Nette;
1314
use Nette\Utils\Arrays;
1415
use PDO;
@@ -226,7 +227,12 @@ public function transaction(callable $callback)
226227
* Generates and executes SQL query.
227228
* @param literal-string $sql
228229
*/
229-
public function query(string $sql, ...$params): ResultSet
230+
public function query(
231+
#[Language('SQL')]
232+
string $sql,
233+
#[Language('GenericSQL')]
234+
...$params
235+
): ResultSet
230236
{
231237
[$this->sql, $params] = $this->preprocess($sql, ...$params);
232238
try {
@@ -274,7 +280,12 @@ public function getLastQueryString(): ?string
274280
* Shortcut for query()->fetch()
275281
* @param literal-string $sql
276282
*/
277-
public function fetch(string $sql, ...$params): ?Row
283+
public function fetch(
284+
#[Language('SQL')]
285+
string $sql,
286+
#[Language('GenericSQL')]
287+
...$params
288+
): ?Row
278289
{
279290
return $this->query($sql, ...$params)->fetch();
280291
}
@@ -285,8 +296,12 @@ public function fetch(string $sql, ...$params): ?Row
285296
* @param literal-string $sql
286297
* @return mixed
287298
*/
288-
public function fetchField(string $sql, ...$params)
289-
{
299+
public function fetchField(
300+
#[Language('SQL')]
301+
string $sql,
302+
#[Language('GenericSQL')]
303+
...$params
304+
) {
290305
return $this->query($sql, ...$params)->fetchField();
291306
}
292307

@@ -295,7 +310,12 @@ public function fetchField(string $sql, ...$params)
295310
* Shortcut for query()->fetchFields()
296311
* @param literal-string $sql
297312
*/
298-
public function fetchFields(string $sql, ...$params): ?array
313+
public function fetchFields(
314+
#[Language('SQL')]
315+
string $sql,
316+
#[Language('GenericSQL')]
317+
...$params
318+
): ?array
299319
{
300320
return $this->query($sql, ...$params)->fetchFields();
301321
}
@@ -305,7 +325,12 @@ public function fetchFields(string $sql, ...$params): ?array
305325
* Shortcut for query()->fetchPairs()
306326
* @param literal-string $sql
307327
*/
308-
public function fetchPairs(string $sql, ...$params): array
328+
public function fetchPairs(
329+
#[Language('SQL')]
330+
string $sql,
331+
#[Language('GenericSQL')]
332+
...$params
333+
): array
309334
{
310335
return $this->query($sql, ...$params)->fetchPairs();
311336
}
@@ -315,7 +340,12 @@ public function fetchPairs(string $sql, ...$params): array
315340
* Shortcut for query()->fetchAll()
316341
* @param literal-string $sql
317342
*/
318-
public function fetchAll(string $sql, ...$params): array
343+
public function fetchAll(
344+
#[Language('SQL')]
345+
string $sql,
346+
#[Language('GenericSQL')]
347+
...$params
348+
): array
319349
{
320350
return $this->query($sql, ...$params)->fetchAll();
321351
}

src/Database/Explorer.php

+37-7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Nette\Database;
1111

12+
use JetBrains\PhpStorm\Language;
1213
use Nette;
1314
use Nette\Database\Conventions\StaticConventions;
1415

@@ -85,7 +86,12 @@ public function getInsertId(?string $sequence = null): string
8586
* Generates and executes SQL query.
8687
* @param literal-string $sql
8788
*/
88-
public function query(string $sql, ...$params): ResultSet
89+
public function query(
90+
#[Language('SQL')]
91+
string $sql,
92+
#[Language('GenericSQL')]
93+
...$params
94+
): ResultSet
8995
{
9096
return $this->connection->query($sql, ...$params);
9197
}
@@ -129,7 +135,12 @@ public function getConventions(): Conventions
129135
* Shortcut for query()->fetch()
130136
* @param literal-string $sql
131137
*/
132-
public function fetch(string $sql, ...$params): ?Row
138+
public function fetch(
139+
#[Language('SQL')]
140+
string $sql,
141+
#[Language('GenericSQL')]
142+
...$params
143+
): ?Row
133144
{
134145
return $this->connection->query($sql, ...$params)->fetch();
135146
}
@@ -140,8 +151,12 @@ public function fetch(string $sql, ...$params): ?Row
140151
* @param literal-string $sql
141152
* @return mixed
142153
*/
143-
public function fetchField(string $sql, ...$params)
144-
{
154+
public function fetchField(
155+
#[Language('SQL')]
156+
string $sql,
157+
#[Language('GenericSQL')]
158+
...$params
159+
) {
145160
return $this->connection->query($sql, ...$params)->fetchField();
146161
}
147162

@@ -150,7 +165,12 @@ public function fetchField(string $sql, ...$params)
150165
* Shortcut for query()->fetchFields()
151166
* @param literal-string $sql
152167
*/
153-
public function fetchFields(string $sql, ...$params): ?array
168+
public function fetchFields(
169+
#[Language('SQL')]
170+
string $sql,
171+
#[Language('GenericSQL')]
172+
...$params
173+
): ?array
154174
{
155175
return $this->connection->query($sql, ...$params)->fetchFields();
156176
}
@@ -160,7 +180,12 @@ public function fetchFields(string $sql, ...$params): ?array
160180
* Shortcut for query()->fetchPairs()
161181
* @param literal-string $sql
162182
*/
163-
public function fetchPairs(string $sql, ...$params): array
183+
public function fetchPairs(
184+
#[Language('SQL')]
185+
string $sql,
186+
#[Language('GenericSQL')]
187+
...$params
188+
): array
164189
{
165190
return $this->connection->query($sql, ...$params)->fetchPairs();
166191
}
@@ -170,7 +195,12 @@ public function fetchPairs(string $sql, ...$params): array
170195
* Shortcut for query()->fetchAll()
171196
* @param literal-string $sql
172197
*/
173-
public function fetchAll(string $sql, ...$params): array
198+
public function fetchAll(
199+
#[Language('SQL')]
200+
string $sql,
201+
#[Language('GenericSQL')]
202+
...$params
203+
): array
174204
{
175205
return $this->connection->query($sql, ...$params)->fetchAll();
176206
}

0 commit comments

Comments
 (0)