Simplify Since and Until operations.

loophp · Jul 18, 2020 · ced44cc · ced44cc
1 parent 51c5402
commit ced44cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/Operation/Compact.php b/src/Operation/Compact.php
@@ -31,9 +31,9 @@ static function (iterable $collection, $values): Generator {
                 return yield from
                 (new Run(
                     new Filter(
-                    /**
-                     * @param mixed $item
-                     */
+                        /**
+                         * @param mixed $item
+                         */
                         static function ($item) use ($values): bool {
                             return !in_array($item, $values, true);
                         }

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -28,13 +28,15 @@ static function (iterable $collection, array $callbacks): Generator {
                 while ($iterator->valid()) {
                     $result = array_reduce(
                         $callbacks,
-                        static function (int $carry, callable $callable) use ($iterator): int {
-                            return $carry & $callable($iterator->current(), $iterator->key());
+                        static function (bool $carry, callable $callable) use ($iterator): bool {
+                            return ($callable($iterator->current(), $iterator->key())) ?
+                                $carry :
+                                false;
                         },
-                        1
+                        true
                     );
 
-                    if (1 === $result) {
+                    if (true === $result) {
                         break;
                     }
 

diff --git a/src/Operation/Until.php b/src/Operation/Until.php
@@ -27,13 +27,15 @@ static function (iterable $collection, array $callbacks): Generator {
 
                     $result = array_reduce(
                         $callbacks,
-                        static function (int $carry, callable $callable) use ($key, $value): int {
-                            return $carry & $callable($value, $key);
+                        static function (bool $carry, callable $callable) use ($key, $value): bool {
+                            return ($callable($value, $key)) ?
+                                $carry :
+                                false;
                         },
-                        1
+                        true
                     );
 
-                    if (1 === $result) {
+                    if (true === $result) {
                         break;
                     }
                 }