Skip to content

Commit f8941f5

Browse files
dgdg
committed
improved native types
1 parent 587def9 commit f8941f5

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
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
}
@@ -143,7 +143,7 @@ public function createGroupedSelection(
143143
* Shortcut for query()->fetch()
144144
* @param literal-string $sql
145145
*/
146-
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?Row
146+
public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?Row
147147
{
148148
return $this->connection->query($sql, ...$params)->fetch();
149149
}
@@ -154,7 +154,7 @@ public function fetch(#[Language('SQL')] string $sql, #[Language('GenericSQL')]
154154
* @param literal-string $sql
155155
* @return ?array<mixed>
156156
*/
157-
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
157+
public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
158158
{
159159
return $this->connection->query($sql, ...$params)->fetchAssoc();
160160
}
@@ -164,7 +164,7 @@ public function fetchAssoc(#[Language('SQL')] string $sql, #[Language('GenericSQ
164164
* Shortcut for query()->fetchField()
165165
* @param literal-string $sql
166166
*/
167-
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): mixed
167+
public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): mixed
168168
{
169169
return $this->connection->query($sql, ...$params)->fetchField();
170170
}
@@ -175,7 +175,7 @@ public function fetchField(#[Language('SQL')] string $sql, #[Language('GenericSQ
175175
* @param literal-string $sql
176176
* @return ?list<mixed>
177177
*/
178-
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
178+
public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
179179
{
180180
return $this->connection->query($sql, ...$params)->fetchList();
181181
}
@@ -186,7 +186,7 @@ public function fetchList(#[Language('SQL')] string $sql, #[Language('GenericSQL
186186
* @param literal-string $sql
187187
* @return ?list<mixed>
188188
*/
189-
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): ?array
189+
public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): ?array
190190
{
191191
return $this->connection->query($sql, ...$params)->fetchList();
192192
}
@@ -197,7 +197,7 @@ public function fetchFields(#[Language('SQL')] string $sql, #[Language('GenericS
197197
* @param literal-string $sql
198198
* @return array<mixed, mixed>
199199
*/
200-
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
200+
public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
201201
{
202202
return $this->connection->query($sql, ...$params)->fetchPairs();
203203
}
@@ -208,7 +208,7 @@ public function fetchPairs(#[Language('SQL')] string $sql, #[Language('GenericSQ
208208
* @param literal-string $sql
209209
* @return list<Row>
210210
*/
211-
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): array
211+
public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL')] mixed ...$params): array
212212
{
213213
return $this->connection->query($sql, ...$params)->fetchAll();
214214
}
@@ -217,7 +217,7 @@ public function fetchAll(#[Language('SQL')] string $sql, #[Language('GenericSQL'
217217
/**
218218
* Creates SQL literal value.
219219
*/
220-
public static function literal(string $value, ...$params): SqlLiteral
220+
public static function literal(string $value, mixed ...$params): SqlLiteral
221221
{
222222
return new SqlLiteral($value, $params);
223223
}

‎src/Database/Table/GroupedSelection.php‎

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

6060

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

7070

71-
public function order(string $columns, ...$params): static
71+
public function order(string $columns, mixed ...$params): static
7272
{
7373
if (!$this->sqlBuilder->getOrder()) {
7474
// improve index utilization
@@ -198,7 +198,7 @@ protected function execute(): void
198198
}
199199

200200

201-
protected function getRefTable(&$refPath): Selection
201+
protected function getRefTable(mixed &$refPath): Selection
202202
{
203203
$refObj = $this->refTable;
204204
$refPath = $this->name . '.';
@@ -235,7 +235,7 @@ protected function emptyResultSet(bool $clearCache = true, bool $deleteReference
235235
/********************* manipulation ****************d*g**/
236236

237237

238-
public function insert(iterable $data): ActiveRow|array|int|bool
238+
public function insert(iterable $data): ActiveRow|array|int
239239
{
240240
if ($data instanceof \Traversable && !$data instanceof Selection) {
241241
$data = iterator_to_array($data);

‎src/Database/Table/Selection.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function getSql(): string
152152
* @internal
153153
* @return list<string>
154154
*/
155-
public function getPreviousAccessedColumns(): array|bool
155+
public function getPreviousAccessedColumns(): array
156156
{
157157
if ($this->cache && $this->previousAccessedColumns === null) {
158158
$this->accessedColumns = $this->previousAccessedColumns = $this->cache->load($this->getGeneralCacheKey());
@@ -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);
@@ -647,7 +647,7 @@ protected function saveCacheState(): void
647647
* @param-out string $refPath
648648
* @return static
649649
*/
650-
protected function getRefTable(&$refPath): self
650+
protected function getRefTable(mixed &$refPath): self
651651
{
652652
$refPath = '';
653653
return $this;
@@ -795,7 +795,7 @@ public function getDataRefreshed(): bool
795795
* @param iterable<string, mixed>|self $data
796796
* @return ($data is array<string, mixed> ? T|array<string, mixed> : int)
797797
*/
798-
public function insert(iterable $data): ActiveRow|array|int|bool
798+
public function insert(iterable $data): ActiveRow|array|int
799799
{
800800
//should be called before query for not to spoil PDO::lastInsertId
801801
$primarySequenceName = $this->getPrimarySequence();

‎src/Database/Table/SqlBuilder.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public function importGroupConditions(self $builder): bool
259259
/**
260260
* Adds SELECT clause, more calls append to the end.
261261
*/
262-
public function addSelect(string $columns, ...$params): void
262+
public function addSelect(string $columns, mixed ...$params): void
263263
{
264264
$this->select[] = $columns;
265265
$this->parameters['select'] = array_merge($this->parameters['select'], $params);
@@ -284,7 +284,7 @@ public function resetSelect(): void
284284
* Adds WHERE condition, more calls append with AND.
285285
* @param array<mixed>|string $condition
286286
*/
287-
public function addWhere(string|array $condition, ...$params): bool
287+
public function addWhere(string|array $condition, mixed ...$params): bool
288288
{
289289
return $this->addCondition($condition, $params, $this->where, $this->parameters['where']);
290290
}
@@ -294,7 +294,7 @@ public function addWhere(string|array $condition, ...$params): bool
294294
* Adds JOIN condition.
295295
* @param array<mixed>|string $condition
296296
*/
297-
public function addJoinCondition(string $tableChain, string|array $condition, ...$params): bool
297+
public function addJoinCondition(string $tableChain, string|array $condition, mixed ...$params): bool
298298
{
299299
$this->parameters['joinConditionSorted'] = null;
300300
if (!isset($this->joinCondition[$tableChain])) {
@@ -490,7 +490,7 @@ protected function checkUniqueTableName(string $tableName, string $chain): void
490490
/**
491491
* Adds ORDER BY clause, more calls append to the end.
492492
*/
493-
public function addOrder(string|array $columns, ...$params): void
493+
public function addOrder(string $columns, mixed ...$params): void
494494
{
495495
$this->order[] = $columns;
496496
$this->parameters['order'] = array_merge($this->parameters['order'], $params);
@@ -540,7 +540,7 @@ public function getOffset(): ?int
540540
/**
541541
* Sets GROUP BY and HAVING clause.
542542
*/
543-
public function setGroup(string|array $columns, ...$params): void
543+
public function setGroup(string $columns, mixed ...$params): void
544544
{
545545
$this->group = $columns;
546546
$this->parameters['group'] = $params;
@@ -553,7 +553,7 @@ public function getGroup(): string
553553
}
554554

555555

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

0 commit comments

Comments
 (0)