diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f5cfb7..f2414f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ - Chg #226: Refactor filter classes to use readonly properties instead of getters (@vjik) - New #213: Add `nextPage()` and `previousPage()` methods to `PaginatorInterface` (@samdark) - New #200: Add matching mode parameter to `Like` filter (@samdark, @vjik) +- New #232: Add `All` and `None` filters (@vjik) ## 1.0.1 January 25, 2023 diff --git a/src/Reader/Filter/All.php b/src/Reader/Filter/All.php new file mode 100644 index 0000000..106feeb --- /dev/null +++ b/src/Reader/Filter/All.php @@ -0,0 +1,15 @@ +coreFilterHandlers = $this->prepareFilterHandlers([ + new AllHandler(), + new NoneHandler(), new AndXHandler(), new OrXHandler(), new BetweenHandler(), diff --git a/tests/Common/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php b/tests/Common/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php new file mode 100644 index 0000000..9cdfb56 --- /dev/null +++ b/tests/Common/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php @@ -0,0 +1,20 @@ +getReader()->withFilter(new All()); + + $result = $reader->read(); + + $this->assertFixtures([0, 1, 2, 3, 4], $result); + } +} diff --git a/tests/Common/Reader/ReaderWithFilter/BaseReaderWithNoneTestCase.php b/tests/Common/Reader/ReaderWithFilter/BaseReaderWithNoneTestCase.php new file mode 100644 index 0000000..e43604a --- /dev/null +++ b/tests/Common/Reader/ReaderWithFilter/BaseReaderWithNoneTestCase.php @@ -0,0 +1,22 @@ +getReader()->withFilter(new None()); + + $result = $reader->read(); + + assertSame([], $result); + } +} diff --git a/tests/Reader/Iterable/FilterHandler/AllHandlerTest.php b/tests/Reader/Iterable/FilterHandler/AllHandlerTest.php new file mode 100644 index 0000000..78430ef --- /dev/null +++ b/tests/Reader/Iterable/FilterHandler/AllHandlerTest.php @@ -0,0 +1,33 @@ +match(['any' => 'value'], new All(), $context); + + assertTrue($result); + } + + public function testGetFilterClass(): void + { + $handler = new AllHandler(); + assertSame(All::class, $handler->getFilterClass()); + } +} diff --git a/tests/Reader/Iterable/FilterHandler/NoneHandlerTest.php b/tests/Reader/Iterable/FilterHandler/NoneHandlerTest.php new file mode 100644 index 0000000..ba8f54f --- /dev/null +++ b/tests/Reader/Iterable/FilterHandler/NoneHandlerTest.php @@ -0,0 +1,32 @@ +match(['any' => 'value'], new None(), $context); + + assertFalse($result); + } + + public function testGetFilterClass(): void + { + $handler = new NoneHandler(); + $this->assertSame(None::class, $handler->getFilterClass()); + } +} diff --git a/tests/Reader/Iterable/ReaderWithFilter/ReaderWithAllTest.php b/tests/Reader/Iterable/ReaderWithFilter/ReaderWithAllTest.php new file mode 100644 index 0000000..30bca5d --- /dev/null +++ b/tests/Reader/Iterable/ReaderWithFilter/ReaderWithAllTest.php @@ -0,0 +1,12 @@ +