refactor: Minor optimizations.

loophp · Jan 30, 2022 · 11bee15 · 11bee15
1 parent 19616a6
commit 11bee15
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 30 deletions.
diff --git a/src/Operation/AsyncMap.php b/src/Operation/AsyncMap.php
@@ -22,7 +22,7 @@
 use function function_exists;
 
 // phpcs:disable
-if (false === function_exists('Amp\ParallelFunctions\parallel')) {
+if (!function_exists('Amp\ParallelFunctions\parallel')) {
     throw new Exception('You need amphp/parallel-functions to get this operation working.');
 }
 // phpcs:enable

diff --git a/src/Operation/AsyncMapN.php b/src/Operation/AsyncMapN.php
@@ -22,7 +22,7 @@
 use function function_exists;
 
 // phpcs:disable
-if (false === function_exists('Amp\ParallelFunctions\parallel')) {
+if (!function_exists('Amp\ParallelFunctions\parallel')) {
     throw new Exception('You need amphp/parallel-functions to get this operation working.');
 }
 // phpcs:enable

diff --git a/src/Operation/Diff.php b/src/Operation/Diff.php
@@ -45,7 +45,7 @@ static function (...$values): Closure {
                         /**
                          * @param T $value
                          */
-                        static fn ($value): bool => false === in_array($value, $values, true);
+                        static fn ($value): bool => !in_array($value, $values, true);
 
                 $filter = (new Filter())()($filterCallbackFactory($values));
 

diff --git a/src/Operation/DiffKeys.php b/src/Operation/DiffKeys.php
@@ -46,7 +46,7 @@ static function (...$keys): Closure {
                          * @param T $value
                          * @param TKey $key
                          */
-                        static fn ($value, $key): bool => false === in_array($key, $keys, true);
+                        static fn ($value, $key): bool => !in_array($key, $keys, true);
 
                 $filter = (new Filter())()($filterCallbackFactory($keys));
 

diff --git a/src/Operation/Distinct.php b/src/Operation/Distinct.php
@@ -64,7 +64,7 @@ static function ($value, $key) use ($comparatorCallback, $accessorCallback, $sta
 
                             $matchFalse = (new MatchOne())()($matchWhenNot)($matcher)($stack);
 
-                            if (true === $matchFalse->current()) {
+                            if ($matchFalse->current()) {
                                 return false;
                             }
 

diff --git a/src/Operation/Duplicate.php b/src/Operation/Duplicate.php
@@ -64,7 +64,7 @@ static function ($value, $key) use ($comparatorCallback, $accessorCallback, $sta
 
                             $matchFalse = (new MatchOne())()($matchWhenNot)($matcher)($stack);
 
-                            if (true === $matchFalse->current()) {
+                            if ($matchFalse->current()) {
                                 return true;
                             }
 

diff --git a/src/Operation/Every.php b/src/Operation/Every.php
@@ -82,7 +82,7 @@ static function (callable ...$callbacks) use ($matchers): Closure {
                         /** @var Closure(Iterator<TKey, T>): Generator<TKey, bool> $pipe */
                         $pipe = Pipe::of()(
                             Map::of()($mapCallback($callbackReducer($callbacks))($callbackReducer($matchers))),
-                            DropWhile::of()(static fn (bool $value): bool => true === $value),
+                            DropWhile::of()(static fn (bool $value): bool => $value),
                             Append::of()(true),
                             Head::of(),
                         );

diff --git a/src/Operation/Falsy.php b/src/Operation/Falsy.php
@@ -31,18 +31,24 @@ public function __invoke(): Closure
         $matchWhenNot = static fn (): bool => true;
         $matcher =
             /**
-             * @param T $value
+             * @param bool $value
              */
-            static fn ($value): bool => (bool) $value;
+            static fn (bool $value): bool => $value;
 
         /** @var Closure(Iterator<TKey, T>): Generator<int, bool> $pipe */
         $pipe = Pipe::of()(
-            MatchOne::of()($matchWhenNot)($matcher),
             Map::of()(
                 /**
                  * @param T $value
                  */
-                static fn ($value): bool => !(bool) $value
+                static fn ($value): bool => (bool) $value
+            ),
+            MatchOne::of()($matchWhenNot)($matcher),
+            Map::of()(
+                /**
+                 * @param bool $value
+                 */
+                static fn (bool $value): bool => !$value
             ),
         );
 

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -39,7 +39,7 @@ public function __invoke(): Closure
                  */
                 static function (Iterator $iterator) use ($depth): Generator {
                     foreach ($iterator as $key => $value) {
-                        if (false === is_iterable($value)) {
+                        if (!is_iterable($value)) {
                             yield $key => $value;
 
                             continue;

diff --git a/src/Operation/Forget.php b/src/Operation/Forget.php
@@ -46,7 +46,7 @@ static function (...$keys): Closure {
                          * @param T $value
                          * @param TKey $key
                          */
-                        static fn ($value, $key): bool => false === in_array($key, $keys, true);
+                        static fn ($value, $key): bool => !in_array($key, $keys, true);
 
                 $filter = (new Filter())()($filterCallbackFactory($keys));
 

diff --git a/src/Operation/Head.php b/src/Operation/Head.php
@@ -45,7 +45,7 @@ static function (Iterator $iterator): Generator {
                     break;
                 }
 
-                if (false === $isEmpty) {
+                if (!$isEmpty) {
                     yield $key => $current;
                 }
             };

diff --git a/src/Operation/Last.php b/src/Operation/Last.php
@@ -43,7 +43,7 @@ static function (Iterator $iterator): Generator {
                     $isEmpty = false;
                 }
 
-                if (false === $isEmpty) {
+                if (!$isEmpty) {
                     yield $key => $current;
                 }
             };

diff --git a/src/Operation/MatchOne.php b/src/Operation/MatchOne.php
@@ -55,7 +55,7 @@ static function (callable ...$callbacks) use ($matchers): Closure {
                                  */
                                 static fn ($value, $key, Iterator $iterator): bool => CallbacksArrayReducer::or()($callbacks, $value, $key, $iterator) === CallbacksArrayReducer::or()($matchers, $value, $key, $iterator)
                             ),
-                            DropWhile::of()(static fn (bool $value): bool => false === $value),
+                            DropWhile::of()(static fn (bool $value): bool => !$value),
                             Append::of()(false),
                             Head::of()
                         );

diff --git a/src/Operation/Nullsy.php b/src/Operation/Nullsy.php
@@ -40,18 +40,24 @@ public function __invoke(): Closure
         $matchWhenNot = static fn (): bool => false;
         $matcher =
             /**
-             * @param T $value
+             * @param bool $value
              */
-            static fn ($value): bool => in_array($value, self::VALUES, true);
+            static fn (bool $value): bool => in_array($value, self::VALUES, true);
 
         /** @var Closure(Iterator<TKey, T>): Generator<int, bool> $pipe */
         $pipe = Pipe::of()(
-            MatchOne::of()($matchWhenNot)($matcher),
             Map::of()(
                 /**
                  * @param T $value
                  */
-                static fn ($value): bool => !$value
+                static fn ($value): bool => (bool) $value
+            ),
+            MatchOne::of()($matchWhenNot)($matcher),
+            Map::of()(
+                /**
+                 * @param bool $value
+                 */
+                static fn (bool $value): bool => !$value
             ),
         );
 

diff --git a/src/Operation/Pluck.php b/src/Operation/Pluck.php
@@ -70,7 +70,7 @@ static function (Iterator $iterator) use ($key, $default): Generator {
                             static function (Iterator $iterator, $target, array $key, $default = null) use (&$pick) {
                                 while (null !== $segment = array_shift($key)) {
                                     if ('*' === $segment) {
-                                        if (false === is_iterable($target)) {
+                                        if (!is_iterable($target)) {
                                             return $default;
                                         }
 
@@ -87,16 +87,16 @@ static function (Iterator $iterator, $target, array $key, $default = null) use (
                                         return in_array('*', $key, true) ? $collapse : $result;
                                     }
 
-                                    if ((true === is_array($target)) && (true === array_key_exists($segment, $target))) {
+                                    if ((is_array($target)) && (array_key_exists($segment, $target))) {
                                         /** @var T $target */
                                         $target = $target[$segment];
-                                    } elseif (($target instanceof ArrayAccess) && (true === $target->offsetExists($segment))) {
+                                    } elseif (($target instanceof ArrayAccess) && ($target->offsetExists($segment))) {
                                         /** @var T $target */
                                         $target = $target[$segment];
                                     } elseif ($target instanceof Collection) {
                                         /** @var T $target */
                                         $target = (Get::of()($segment)($default)($target->getIterator()))->current();
-                                    } elseif ((true === is_object($target)) && (true === property_exists($target, $segment))) {
+                                    } elseif ((is_object($target)) && (property_exists($target, $segment))) {
                                         /** @var T $target */
                                         $target = (new ReflectionClass($target))->getProperty($segment)->getValue($target);
                                     } else {
@@ -107,7 +107,7 @@ static function (Iterator $iterator, $target, array $key, $default = null) use (
                                 return $target;
                             };
 
-                        $key = true === is_scalar($key) ? explode('.', trim((string) $key, '.')) : $key;
+                        $key = is_scalar($key) ? explode('.', trim((string) $key, '.')) : $key;
 
                         foreach ($iterator as $value) {
                             yield $pick($iterator, $value, $key, $default);

diff --git a/src/Operation/Split.php b/src/Operation/Split.php
@@ -58,15 +58,15 @@ static function (Iterator $iterator) use ($type, $callbacks): Generator {
                                 $carry[] = $current;
                             }
 
-                            if (Splitable::REMOVE === $type && true === $callbackReturn) {
+                            if ($callbackReturn && (Splitable::REMOVE === $type)) {
                                 yield $carry;
 
                                 $carry = [];
 
                                 continue;
                             }
 
-                            if (true === $callbackReturn && [] !== $carry) {
+                            if ($callbackReturn && ([] !== $carry)) {
                                 yield $carry;
 
                                 $carry = [];

diff --git a/src/Operation/Truthy.php b/src/Operation/Truthy.php
@@ -31,12 +31,18 @@ public function __invoke(): Closure
         $matchWhenNot = static fn (): bool => true;
         $matcher =
             /**
-             * @param T $value
+             * @param bool $value
              */
-            static fn ($value): bool => !(bool) $value;
+            static fn (bool $value): bool => !$value;
 
         /** @var Closure(Iterator<TKey, T>): Generator<int, bool> $pipe */
         $pipe = Pipe::of()(
+            Map::of()(
+                /**
+                 * @param T $value
+                 */
+                static fn ($value): bool => (bool) $value
+            ),
             MatchOne::of()($matchWhenNot)($matcher),
             Map::of()($matcher),
         );

diff --git a/src/Operation/When.php b/src/Operation/When.php
@@ -54,6 +54,6 @@ public function __invoke(): Closure
                          *
                          * @return Generator<TKey, T>
                          */
-                        static fn (Iterator $iterator): Generator => yield from (true === $predicate($iterator)) ? $whenTrue($iterator) : $whenFalse($iterator);
+                        static fn (Iterator $iterator): Generator => yield from ($predicate($iterator) ? $whenTrue($iterator) : $whenFalse($iterator));
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ static function (Iterator $iterator): Generator { @@
                         break;
                     }
-                    if (false === $isEmpty) {
+                    if (!$isEmpty) {
                         yield $key => $current;
                     }
                 };
@@ Expand Down @@