Skip to content

Commit 0f469a3

Browse files
committed
Fixed methods when $criteria can be null
1 parent 13c6ca2 commit 0f469a3

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,12 @@ public function clearRecords(): array;
491491
Upgrades & updates
492492
==================
493493

494-
### v6.1.1 (last stable)
494+
### v6.1.2 (last stable)
495+
496+
- Fixed methods ```search*()```
497+
- Fixed methods when argument ```$criteria``` can be NULL
498+
499+
### v6.1.1
495500

496501
- Fixed logging.
497502
- Deleted useless files and updated ```.gitignore```

src/Client.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public function delete(string $modelName, $ids): void
179179
* @throws InvalidArgumentException when $criteria value is not valid
180180
* @throws RequestException when request failed
181181
*/
182-
public function searchOne(string $modelName, $criteria = null): ?int
182+
public function searchOne(string $modelName, $criteria): ?int
183183
{
184184
$options['limit'] = 1;
185185

@@ -198,7 +198,9 @@ public function searchOne(string $modelName, $criteria = null): ?int
198198
*/
199199
public function searchAll(string $modelName, array $options = []): array
200200
{
201-
return $this->search($modelName, null, $options);
201+
return array_column($this->findBy($modelName, null, array_merge($options, [
202+
'fields' => ['id']
203+
])), 'id');
202204
}
203205

204206
/**
@@ -211,7 +213,7 @@ public function searchAll(string $modelName, array $options = []): array
211213
*
212214
* @return array<int>
213215
*/
214-
public function search(string $modelName, $criteria = null, array $options = []): array
216+
public function search(string $modelName, $criteria, array $options = []): array
215217
{
216218
if (array_key_exists('fields', $options)) {
217219
unset($options['fields']);

src/Expression/ExpressionBuilder.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,10 @@ public function clearRecords(): array
254254
*/
255255
public function normalizeDomains($criteria = null): array
256256
{
257+
if(!$criteria) {
258+
return [];
259+
}
260+
257261
if ($criteria instanceof DomainInterface) {
258262
return $criteria instanceof CompositeDomain ? [$criteria->toArray()] : [[$criteria->toArray()]];
259263
}

0 commit comments

Comments
 (0)