Skip to content

Commit

Permalink
used PhpStorm Language attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Oct 9, 2023
1 parent 0da02bc commit ca222bd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"ext-pdo": "*",
"nette/caching": "^3.0",
"nette/utils": "^3.2.1 || ~4.0.0"
"jetbrains/phpstorm-attributes": "dev-master"
},
"require-dev": {
"nette/tester": "^2.4",
Expand Down
13 changes: 7 additions & 6 deletions src/Database/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

namespace Nette\Database;

use JetBrains\PhpStorm\Language;
use Nette;
use Nette\Utils\Arrays;
use PDO;
Expand Down Expand Up @@ -226,7 +227,7 @@ public function transaction(callable $callback)
* Generates and executes SQL query.
* @param literal-string $sql
*/
public function query(string $sql, ...$params): ResultSet
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ResultSet
{
[$this->sql, $params] = $this->preprocess($sql, ...$params);
try {
Expand Down Expand Up @@ -274,7 +275,7 @@ public function getLastQueryString(): ?string
* Shortcut for query()->fetch()
* @param literal-string $sql
*/
public function fetch(string $sql, ...$params): ?Row
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?Row
{
return $this->query($sql, ...$params)->fetch();
}
Expand All @@ -285,7 +286,7 @@ public function fetch(string $sql, ...$params): ?Row
* @param literal-string $sql
* @return mixed
*/
public function fetchField(string $sql, ...$params)
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params)
{
return $this->query($sql, ...$params)->fetchField();
}
Expand All @@ -295,7 +296,7 @@ public function fetchField(string $sql, ...$params)
* Shortcut for query()->fetchFields()
* @param literal-string $sql
*/
public function fetchFields(string $sql, ...$params): ?array
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
{
return $this->query($sql, ...$params)->fetchFields();
}
Expand All @@ -305,7 +306,7 @@ public function fetchFields(string $sql, ...$params): ?array
* Shortcut for query()->fetchPairs()
* @param literal-string $sql
*/
public function fetchPairs(string $sql, ...$params): array
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
{
return $this->query($sql, ...$params)->fetchPairs();
}
Expand All @@ -315,7 +316,7 @@ public function fetchPairs(string $sql, ...$params): array
* Shortcut for query()->fetchAll()
* @param literal-string $sql
*/
public function fetchAll(string $sql, ...$params): array
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
{
return $this->query($sql, ...$params)->fetchAll();
}
Expand Down
13 changes: 7 additions & 6 deletions src/Database/Explorer.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

namespace Nette\Database;

use JetBrains\PhpStorm\Language;
use Nette;
use Nette\Database\Conventions\StaticConventions;

Expand Down Expand Up @@ -85,7 +86,7 @@ public function getInsertId(?string $sequence = null): string
* Generates and executes SQL query.
* @param literal-string $sql
*/
public function query(string $sql, ...$params): ResultSet
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ResultSet
{
return $this->connection->query($sql, ...$params);
}
Expand Down Expand Up @@ -129,7 +130,7 @@ public function getConventions(): Conventions
* Shortcut for query()->fetch()
* @param literal-string $sql
*/
public function fetch(string $sql, ...$params): ?Row
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?Row
{
return $this->connection->query($sql, ...$params)->fetch();
}
Expand All @@ -140,7 +141,7 @@ public function fetch(string $sql, ...$params): ?Row
* @param literal-string $sql
* @return mixed
*/
public function fetchField(string $sql, ...$params)
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params)
{
return $this->connection->query($sql, ...$params)->fetchField();
}
Expand All @@ -150,7 +151,7 @@ public function fetchField(string $sql, ...$params)
* Shortcut for query()->fetchFields()
* @param literal-string $sql
*/
public function fetchFields(string $sql, ...$params): ?array
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
{
return $this->connection->query($sql, ...$params)->fetchFields();
}
Expand All @@ -160,7 +161,7 @@ public function fetchFields(string $sql, ...$params): ?array
* Shortcut for query()->fetchPairs()
* @param literal-string $sql
*/
public function fetchPairs(string $sql, ...$params): array
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
{
return $this->connection->query($sql, ...$params)->fetchPairs();
}
Expand All @@ -170,7 +171,7 @@ public function fetchPairs(string $sql, ...$params): array
* Shortcut for query()->fetchAll()
* @param literal-string $sql
*/
public function fetchAll(string $sql, ...$params): array
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
{
return $this->connection->query($sql, ...$params)->fetchAll();
}
Expand Down

0 comments on commit ca222bd

Please sign in to comment.