Skip to content

Commit 3b06593

Browse files
committed
Updated filters
1 parent 173cc9a commit 3b06593

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/CustomerExtractor.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ private function compileQueryParameters(int $currentPage = 1): array
3131
$parameters['searchCriteria[pageSize]'] = $this->pageSize;
3232

3333
$filters = array_map(fn (FilterGroup $item, int $key) => $item->compileFilters($key), $this->filters, array_keys($this->filters));
34-
3534
return array_merge($parameters, ...$filters);
3635
}
3736

src/OrderExtractor.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public function __construct(
1919
private \Psr\Log\LoggerInterface $logger,
2020
private \Kiboko\Magento\V2_1\Client|\Kiboko\Magento\V2_2\Client|\Kiboko\Magento\V2_3\Client|\Kiboko\Magento\V2_4\Client $client,
2121
private int $pageSize = 100,
22+
/** @var FilterGroup[] $filters */
2223
private array $filters = [],
2324
) {
2425
}
@@ -29,7 +30,8 @@ private function compileQueryParameters(int $currentPage = 1): array
2930
$parameters['searchCriteria[currentPage]'] = $currentPage;
3031
$parameters['searchCriteria[pageSize]'] = $this->pageSize;
3132

32-
return array_merge($parameters, $this->filters);
33+
$filters = array_map(fn (FilterGroup $item, int $key) => $item->compileFilters($key), $this->filters, array_keys($this->filters));
34+
return array_merge($parameters, ...$filters);
3335
}
3436

3537
public function extract(): iterable

src/ProductExtractor.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public function __construct(
1919
private \Psr\Log\LoggerInterface $logger,
2020
private \Kiboko\Magento\V2_1\Client|\Kiboko\Magento\V2_2\Client|\Kiboko\Magento\V2_3\Client|\Kiboko\Magento\V2_4\Client $client,
2121
private int $pageSize = 100,
22+
/** @var FilterGroup[] $filters */
2223
private array $filters = [],
2324
) {
2425
}
@@ -29,7 +30,8 @@ private function compileQueryParameters(int $currentPage = 1): array
2930
$parameters['searchCriteria[currentPage]'] = $currentPage;
3031
$parameters['searchCriteria[pageSize]'] = $this->pageSize;
3132

32-
return array_merge($parameters, $this->filters);
33+
$filters = array_map(fn (FilterGroup $item, int $key) => $item->compileFilters($key), $this->filters, array_keys($this->filters));
34+
return array_merge($parameters, ...$filters);
3335
}
3436

3537
public function extract(): iterable

0 commit comments

Comments
 (0)