Skip to content

Commit a89fda3

Browse files
dgdg
committed
improved native types
1 parent e6fb30f commit a89fda3

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

‎src/Database/Connection.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public function transaction(callable $callback): mixed
245245
* Generates and executes SQL query.
246246
* @param literal-string $sql
247247
*/
248-
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ResultSet
248+
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ResultSet
249249
{
250250
[$this->sql, $params] = $this->preprocess($sql, ...$params);
251251
try {
@@ -275,7 +275,7 @@ public function queryArgs(string $sql, array $params): ResultSet
275275
* @param literal-string $sql
276276
* @return array{string, array<mixed>}
277277
*/
278-
public function preprocess(string $sql, ...$params): array
278+
public function preprocess(string $sql, mixed ...$params): array
279279
{
280280
$this->connect();
281281
return $params
@@ -297,7 +297,7 @@ public function getLastQueryString(): ?string
297297
* Shortcut for query()->fetch()
298298
* @param literal-string $sql
299299
*/
300-
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?Row
300+
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?Row
301301
{
302302
return $this->query($sql, ...$params)->fetch();
303303
}
@@ -308,7 +308,7 @@ public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')]
308308
* @param literal-string $sql
309309
* @return ?array<mixed>
310310
*/
311-
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
311+
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
312312
{
313313
return $this->query($sql, ...$params)->fetchAssoc();
314314
}
@@ -318,7 +318,7 @@ public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQ
318318
* Shortcut for query()->fetchField()
319319
* @param literal-string $sql
320320
*/
321-
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): mixed
321+
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): mixed
322322
{
323323
return $this->query($sql, ...$params)->fetchField();
324324
}
@@ -329,7 +329,7 @@ public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQ
329329
* @param literal-string $sql
330330
* @return ?list<mixed>
331331
*/
332-
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
332+
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
333333
{
334334
return $this->query($sql, ...$params)->fetchList();
335335
}
@@ -340,7 +340,7 @@ public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL
340340
* @param literal-string $sql
341341
* @return ?list<mixed>
342342
*/
343-
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
343+
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
344344
{
345345
return $this->query($sql, ...$params)->fetchList();
346346
}
@@ -351,7 +351,7 @@ public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericS
351351
* @param literal-string $sql
352352
* @return array<mixed, mixed>
353353
*/
354-
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
354+
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
355355
{
356356
return $this->query($sql, ...$params)->fetchPairs();
357357
}
@@ -362,7 +362,7 @@ public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQ
362362
* @param literal-string $sql
363363
* @return list<Row>
364364
*/
365-
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
365+
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
366366
{
367367
return $this->query($sql, ...$params)->fetchAll();
368368
}
@@ -371,7 +371,7 @@ public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL'
371371
/**
372372
* Creates SQL literal value.
373373
*/
374-
public static function literal(string $value, ...$params): SqlLiteral
374+
public static function literal(string $value, mixed ...$params): SqlLiteral
375375
{
376376
return new SqlLiteral($value, $params);
377377
}

‎src/Database/Explorer.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getInsertId(?string $sequence = null): string
6666
* Generates and executes SQL query.
6767
* @param literal-string $sql
6868
*/
69-
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ResultSet
69+
public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ResultSet
7070
{
7171
return $this->connection->query($sql, ...$params);
7272
}
@@ -142,7 +142,7 @@ public function createGroupedSelection(
142142
* Shortcut for query()->fetch()
143143
* @param literal-string $sql
144144
*/
145-
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?Row
145+
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?Row
146146
{
147147
return $this->connection->query($sql, ...$params)->fetch();
148148
}
@@ -153,7 +153,7 @@ public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')]
153153
* @param literal-string $sql
154154
* @return ?array<mixed>
155155
*/
156-
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
156+
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
157157
{
158158
return $this->connection->query($sql, ...$params)->fetchAssoc();
159159
}
@@ -163,7 +163,7 @@ public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQ
163163
* Shortcut for query()->fetchField()
164164
* @param literal-string $sql
165165
*/
166-
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): mixed
166+
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): mixed
167167
{
168168
return $this->connection->query($sql, ...$params)->fetchField();
169169
}
@@ -174,7 +174,7 @@ public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQ
174174
* @param literal-string $sql
175175
* @return ?list<mixed>
176176
*/
177-
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
177+
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
178178
{
179179
return $this->connection->query($sql, ...$params)->fetchList();
180180
}
@@ -185,7 +185,7 @@ public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL
185185
* @param literal-string $sql
186186
* @return ?list<mixed>
187187
*/
188-
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
188+
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
189189
{
190190
return $this->connection->query($sql, ...$params)->fetchList();
191191
}
@@ -196,7 +196,7 @@ public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericS
196196
* @param literal-string $sql
197197
* @return array<mixed, mixed>
198198
*/
199-
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
199+
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
200200
{
201201
return $this->connection->query($sql, ...$params)->fetchPairs();
202202
}
@@ -207,7 +207,7 @@ public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQ
207207
* @param literal-string $sql
208208
* @return list<Row>
209209
*/
210-
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
210+
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
211211
{
212212
return $this->connection->query($sql, ...$params)->fetchAll();
213213
}
@@ -216,7 +216,7 @@ public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL'
216216
/**
217217
* Creates SQL literal value.
218218
*/
219-
public static function literal(string $value, ...$params): SqlLiteral
219+
public static function literal(string $value, mixed ...$params): SqlLiteral
220220
{
221221
return new SqlLiteral($value, $params);
222222
}

‎src/Database/Table/GroupedSelection.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function setActive(int|string $active): static
5757
}
5858

5959

60-
public function select(string $columns, ...$params): static
60+
public function select(string $columns, mixed ...$params): static
6161
{
6262
if (!$this->sqlBuilder->getSelect()) {
6363
$this->sqlBuilder->addSelect("$this->name.$this->column");
@@ -67,7 +67,7 @@ public function select(string $columns, ...$params): static
6767
}
6868

6969

70-
public function order(string $columns, ...$params): static
70+
public function order(string $columns, mixed ...$params): static
7171
{
7272
if (!$this->sqlBuilder->getOrder()) {
7373
// improve index utilization

‎src/Database/Table/Selection.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function fetchAssoc(string $path): array
260260
* Adds select clause, more calls append to the end.
261261
* @param string $columns for example "column, MD5(column) AS column_md5"
262262
*/
263-
public function select(string $columns, ...$params): static
263+
public function select(string $columns, mixed ...$params): static
264264
{
265265
$this->emptyResultSet();
266266
$this->sqlBuilder->addSelect($columns, ...$params);
@@ -295,7 +295,7 @@ public function wherePrimary(mixed $key): static
295295
* Adds where condition, more calls append with AND.
296296
* @param string|array<int|string, mixed> $condition possibly containing ?
297297
*/
298-
public function where(string|array $condition, ...$params): static
298+
public function where(string|array $condition, mixed ...$params): static
299299
{
300300
$this->condition($condition, $params);
301301
return $this;
@@ -307,7 +307,7 @@ public function where(string|array $condition, ...$params): static
307307
* @param string $tableChain table chain or table alias for which you need additional left join condition
308308
* @param string $condition possibly containing ?
309309
*/
310-
public function joinWhere(string $tableChain, string $condition, ...$params): static
310+
public function joinWhere(string $tableChain, string $condition, mixed ...$params): static
311311
{
312312
$this->condition($condition, $params, $tableChain);
313313
return $this;
@@ -378,7 +378,7 @@ public function whereOr(array $parameters): static
378378
* Adds ORDER BY clause, more calls appends to the end.
379379
* @param string $columns for example 'column1, column2 DESC'
380380
*/
381-
public function order(string $columns, ...$params): static
381+
public function order(string $columns, mixed ...$params): static
382382
{
383383
$this->emptyResultSet();
384384
$this->sqlBuilder->addOrder($columns, ...$params);
@@ -400,7 +400,7 @@ public function limit(?int $limit, ?int $offset = null): static
400400
/**
401401
* Sets OFFSET using page number, more calls rewrite old values.
402402
*/
403-
public function page(int $page, int $itemsPerPage, &$numOfPages = null): static
403+
public function page(int $page, int $itemsPerPage, ?int &$numOfPages = null): static
404404
{
405405
if (func_num_args() > 2) {
406406
$numOfPages = (int) ceil($this->count('*') / $itemsPerPage);
@@ -417,7 +417,7 @@ public function page(int $page, int $itemsPerPage, &$numOfPages = null): static
417417
/**
418418
* Sets GROUP BY clause, more calls rewrite old value.
419419
*/
420-
public function group(string $columns, ...$params): static
420+
public function group(string $columns, mixed ...$params): static
421421
{
422422
$this->emptyResultSet();
423423
$this->sqlBuilder->setGroup($columns, ...$params);
@@ -428,7 +428,7 @@ public function group(string $columns, ...$params): static
428428
/**
429429
* Sets HAVING clause, more calls rewrite old value.
430430
*/
431-
public function having(string $having, ...$params): static
431+
public function having(string $having, mixed ...$params): static
432432
{
433433
$this->emptyResultSet();
434434
$this->sqlBuilder->setHaving($having, ...$params);

‎src/Database/Table/SqlBuilder.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function importGroupConditions(self $builder): bool
260260
/**
261261
* Adds SELECT clause, more calls append to the end.
262262
*/
263-
public function addSelect(string $columns, ...$params): void
263+
public function addSelect(string $columns, mixed ...$params): void
264264
{
265265
$this->select[] = $columns;
266266
$this->parameters['select'] = array_merge($this->parameters['select'], $params);
@@ -285,7 +285,7 @@ public function resetSelect(): void
285285
* Adds WHERE condition, more calls append with AND.
286286
* @param array<mixed>|string $condition
287287
*/
288-
public function addWhere(string|array $condition, ...$params): bool
288+
public function addWhere(string|array $condition, mixed ...$params): bool
289289
{
290290
return $this->addCondition($condition, $params, $this->where, $this->parameters['where']);
291291
}
@@ -295,7 +295,7 @@ public function addWhere(string|array $condition, ...$params): bool
295295
* Adds JOIN condition.
296296
* @param array<mixed>|string $condition
297297
*/
298-
public function addJoinCondition(string $tableChain, string|array $condition, ...$params): bool
298+
public function addJoinCondition(string $tableChain, string|array $condition, mixed ...$params): bool
299299
{
300300
$this->parameters['joinConditionSorted'] = null;
301301
if (!isset($this->joinCondition[$tableChain])) {
@@ -491,7 +491,7 @@ protected function checkUniqueTableName(string $tableName, string $chain): void
491491
/**
492492
* Adds ORDER BY clause, more calls append to the end.
493493
*/
494-
public function addOrder(string|array $columns, ...$params): void
494+
public function addOrder(string $columns, mixed ...$params): void
495495
{
496496
$this->order[] = $columns;
497497
$this->parameters['order'] = array_merge($this->parameters['order'], $params);
@@ -541,7 +541,7 @@ public function getOffset(): ?int
541541
/**
542542
* Sets GROUP BY and HAVING clause.
543543
*/
544-
public function setGroup(string|array $columns, ...$params): void
544+
public function setGroup(string $columns, mixed ...$params): void
545545
{
546546
$this->group = $columns;
547547
$this->parameters['group'] = $params;
@@ -554,7 +554,7 @@ public function getGroup(): string
554554
}
555555

556556

557-
public function setHaving(string $having, ...$params): void
557+
public function setHaving(string $having, mixed ...$params): void
558558
{
559559
$this->having = $having;
560560
$this->parameters['having'] = $params;

0 commit comments

Comments
 (0)