IterableProcessorInterface extend FilterProcessorInterface (#117)

yiisoft · Dec 29, 2022 · ff32287 · ff32287
1 parent d458436
commit ff32287
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/src/Reader/Iterable/IterableDataReader.php b/src/Reader/Iterable/IterableDataReader.php
@@ -51,7 +51,7 @@ class IterableDataReader implements DataReaderInterface
     private int $offset = 0;
 
     /**
-     * @psalm-var array<string, FilterProcessorInterface&IterableProcessorInterface>
+     * @psalm-var array<string, IterableProcessorInterface>
      */
     private array $filterProcessors = [];
 

diff --git a/src/Reader/Iterable/Processor/Between.php b/src/Reader/Iterable/Processor/Between.php
@@ -7,12 +7,11 @@
 use DateTimeInterface;
 use InvalidArgumentException;
 use Yiisoft\Arrays\ArrayHelper;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function count;
 
-final class Between implements IterableProcessorInterface, FilterProcessorInterface
+final class Between implements IterableProcessorInterface
 {
     public function getOperator(): string
     {

diff --git a/src/Reader/Iterable/Processor/CompareProcessor.php b/src/Reader/Iterable/Processor/CompareProcessor.php
@@ -6,12 +6,11 @@
 
 use InvalidArgumentException;
 use Yiisoft\Arrays\ArrayHelper;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function count;
 
-abstract class CompareProcessor implements IterableProcessorInterface, FilterProcessorInterface
+abstract class CompareProcessor implements IterableProcessorInterface
 {
     /**
      * @param mixed $itemValue

diff --git a/src/Reader/Iterable/Processor/EqualsEmpty.php b/src/Reader/Iterable/Processor/EqualsEmpty.php
@@ -5,12 +5,11 @@
 namespace Yiisoft\Data\Reader\Iterable\Processor;
 
 use InvalidArgumentException;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function count;
 
-final class EqualsEmpty implements IterableProcessorInterface, FilterProcessorInterface
+final class EqualsEmpty implements IterableProcessorInterface
 {
     public function getOperator(): string
     {

diff --git a/src/Reader/Iterable/Processor/EqualsNull.php b/src/Reader/Iterable/Processor/EqualsNull.php
@@ -6,12 +6,11 @@
 
 use InvalidArgumentException;
 use Yiisoft\Arrays\ArrayHelper;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function count;
 
-final class EqualsNull implements IterableProcessorInterface, FilterProcessorInterface
+final class EqualsNull implements IterableProcessorInterface
 {
     public function getOperator(): string
     {

diff --git a/src/Reader/Iterable/Processor/GroupProcessor.php b/src/Reader/Iterable/Processor/GroupProcessor.php
@@ -5,7 +5,6 @@
 namespace Yiisoft\Data\Reader\Iterable\Processor;
 
 use InvalidArgumentException;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function array_shift;
@@ -14,7 +13,7 @@
 use function is_string;
 use function sprintf;
 
-abstract class GroupProcessor implements IterableProcessorInterface, FilterProcessorInterface
+abstract class GroupProcessor implements IterableProcessorInterface
 {
     abstract protected function checkResults(array $results): bool;
 
@@ -60,7 +59,6 @@ public function match(array|object $item, array $arguments, array $filterProcess
                 throw new InvalidArgumentException('The operator string cannot be empty.');
             }
 
-            /** @var IterableProcessorInterface|null $filterProcessor */
             $filterProcessor = $filterProcessors[$operator] ?? null;
 
             if ($filterProcessor === null) {

diff --git a/src/Reader/Iterable/Processor/IterableProcessorInterface.php b/src/Reader/Iterable/Processor/IterableProcessorInterface.php
@@ -4,7 +4,9 @@
 
 namespace Yiisoft\Data\Reader\Iterable\Processor;
 
-interface IterableProcessorInterface
+use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
+
+interface IterableProcessorInterface extends FilterProcessorInterface
 {
     public function match(array|object $item, array $arguments, array $filterProcessors): bool;
 }
diff --git a/src/Reader/Iterable/Processor/Not.php b/src/Reader/Iterable/Processor/Not.php
@@ -5,7 +5,6 @@
 namespace Yiisoft\Data\Reader\Iterable\Processor;
 
 use InvalidArgumentException;
-use Yiisoft\Data\Reader\Filter\FilterProcessorInterface;
 use Yiisoft\Data\Reader\FilterDataValidationHelper;
 
 use function array_shift;
@@ -14,7 +13,7 @@
 use function is_string;
 use function sprintf;
 
-final class Not implements IterableProcessorInterface, FilterProcessorInterface
+final class Not implements IterableProcessorInterface
 {
     public function getOperator(): string
     {
@@ -53,7 +52,6 @@ public function match(array|object $item, array $arguments, array $filterProcess
             throw new InvalidArgumentException('The operator string cannot be empty.');
         }
 
-        /** @var IterableProcessorInterface|null $filterProcessor */
         $filterProcessor = $filterProcessors[$operator] ?? null;
 
         if ($filterProcessor === null) {