diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c08243..5fd9cfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,7 +65,8 @@ - Bug #234: Fix handling of `null` values in `IterableDataReader` (@vjik) - New #236: Add `PaginatorInterface::getFilter()` method (@vjik) - Chg #241: Remove `FilterHandlerInterface` interface (@vjik) -- Chg #242: Change `IterableDataReader::withAddedFilterHandlers()` to `$addFilterHandlers` constructor parameter (@vjik) +- Chg #242, #244: Change `IterableDataReader::withAddedFilterHandlers()` to `$extraFilterHandlers` constructor parameter + (@vjik) ## 1.0.1 January 25, 2023 diff --git a/src/Reader/Iterable/IterableDataReader.php b/src/Reader/Iterable/IterableDataReader.php index f0e0342..1c1675f 100644 --- a/src/Reader/Iterable/IterableDataReader.php +++ b/src/Reader/Iterable/IterableDataReader.php @@ -62,13 +62,13 @@ final class IterableDataReader implements DataReaderInterface /** * @param iterable $data Data to iterate. - * @param IterableFilterHandlerInterface[] $addFilterHandlers + * @param IterableFilterHandlerInterface[] $extraFilterHandlers * @psalm-param iterable $data */ public function __construct( private readonly iterable $data, ValueReaderInterface $valueReader = new FlatValueReader(), - array $addFilterHandlers = [], + array $extraFilterHandlers = [], ) { $filterHandlers = $this->prepareFilterHandlers([ new AllHandler(), @@ -85,7 +85,7 @@ public function __construct( new LessThanOrEqualHandler(), new LikeHandler(), new NotHandler(), - ...$addFilterHandlers, + ...$extraFilterHandlers, ]); $this->context = new Context($filterHandlers, $valueReader); $this->filter = new All(); diff --git a/tests/Reader/Iterable/IterableDataReaderTest.php b/tests/Reader/Iterable/IterableDataReaderTest.php index 8499ad7..f217256 100644 --- a/tests/Reader/Iterable/IterableDataReaderTest.php +++ b/tests/Reader/Iterable/IterableDataReaderTest.php @@ -380,7 +380,7 @@ public function testGeneratorAsDataSet(): void public function testCustomFilter(): void { $filter = new AndX(new GreaterThan('id', 0), new Digital('name')); - $reader = (new IterableDataReader(self::DEFAULT_DATASET, addFilterHandlers: [new DigitalHandler()])) + $reader = (new IterableDataReader(self::DEFAULT_DATASET, extraFilterHandlers: [new DigitalHandler()])) ->withFilter($filter); $filtered = $reader->read(); @@ -409,7 +409,7 @@ public function match( } }; - $dataReader = (new IterableDataReader(self::DEFAULT_DATASET, addFilterHandlers: [$customEquals])) + $dataReader = (new IterableDataReader(self::DEFAULT_DATASET, extraFilterHandlers: [$customEquals])) ->withSort($sort); $dataReader = $dataReader->withFilter(new Equals('id', 100));