Skip to content

Commit c4bf3fb

Browse files
authored
Rename $addFilterHandlers to $extraFilterHandlers (#244)
1 parent 38a1ac6 commit c4bf3fb

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
- Bug #234: Fix handling of `null` values in `IterableDataReader` (@vjik)
6666
- New #236: Add `PaginatorInterface::getFilter()` method (@vjik)
6767
- Chg #241: Remove `FilterHandlerInterface` interface (@vjik)
68-
- Chg #242: Change `IterableDataReader::withAddedFilterHandlers()` to `$addFilterHandlers` constructor parameter (@vjik)
68+
- Chg #242, #244: Change `IterableDataReader::withAddedFilterHandlers()` to `$extraFilterHandlers` constructor parameter
69+
(@vjik)
6970

7071
## 1.0.1 January 25, 2023
7172

src/Reader/Iterable/IterableDataReader.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ final class IterableDataReader implements DataReaderInterface
6262

6363
/**
6464
* @param iterable $data Data to iterate.
65-
* @param IterableFilterHandlerInterface[] $addFilterHandlers
65+
* @param IterableFilterHandlerInterface[] $extraFilterHandlers
6666
* @psalm-param iterable<TKey, TValue> $data
6767
*/
6868
public function __construct(
6969
private readonly iterable $data,
7070
ValueReaderInterface $valueReader = new FlatValueReader(),
71-
array $addFilterHandlers = [],
71+
array $extraFilterHandlers = [],
7272
) {
7373
$filterHandlers = $this->prepareFilterHandlers([
7474
new AllHandler(),
@@ -85,7 +85,7 @@ public function __construct(
8585
new LessThanOrEqualHandler(),
8686
new LikeHandler(),
8787
new NotHandler(),
88-
...$addFilterHandlers,
88+
...$extraFilterHandlers,
8989
]);
9090
$this->context = new Context($filterHandlers, $valueReader);
9191
$this->filter = new All();

tests/Reader/Iterable/IterableDataReaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public function testGeneratorAsDataSet(): void
380380
public function testCustomFilter(): void
381381
{
382382
$filter = new AndX(new GreaterThan('id', 0), new Digital('name'));
383-
$reader = (new IterableDataReader(self::DEFAULT_DATASET, addFilterHandlers: [new DigitalHandler()]))
383+
$reader = (new IterableDataReader(self::DEFAULT_DATASET, extraFilterHandlers: [new DigitalHandler()]))
384384
->withFilter($filter);
385385

386386
$filtered = $reader->read();
@@ -409,7 +409,7 @@ public function match(
409409
}
410410
};
411411

412-
$dataReader = (new IterableDataReader(self::DEFAULT_DATASET, addFilterHandlers: [$customEquals]))
412+
$dataReader = (new IterableDataReader(self::DEFAULT_DATASET, extraFilterHandlers: [$customEquals]))
413413
->withSort($sort);
414414

415415
$dataReader = $dataReader->withFilter(new Equals('id', 100));

0 commit comments

Comments
 (0)