Uses static closures

pitchart · pitchart · commit 8e9294dae567 · 2020-03-12T20:31:16.000+01:00
diff --git a/src/Composition.php b/src/Composition.php
@@ -36,7 +36,7 @@ public function __construct(callable ...$functions)
     public function __invoke()
     {
         if (empty($this->functions)) {
-            return (function ($value) {
+            return (static function ($value) {
                 return $value;
             })(func_get_arg(0));
         }
@@ -46,7 +46,7 @@ public function __invoke()
 
         return array_reduce(
             $functionList,
-            function ($carry, $item) {
+            static function ($carry, $item) {
                 return $item($carry);
             },
             call_user_func_array($first, func_get_args())
diff --git a/src/Curry.php b/src/Curry.php
@@ -33,8 +33,8 @@ public function __invoke(...$arguments)
     {
         $function = $this->function;
 
-        return function (...$args) use ($function, $arguments) {
-            return (function ($arguments) use ($function) {
+        return static function (...$args) use ($function, $arguments) {
+            return (static function ($arguments) use ($function) {
                 if (count($arguments) < (new \ReflectionFunction($function))->getNumberOfRequiredParameters()) {
                     return new self($function, ...$arguments);
                 }
diff --git a/src/Reducer/Termination/Operation.php b/src/Reducer/Termination/Operation.php
@@ -32,19 +32,19 @@ public function __construct(string $operation)
     {
         if (self::$operators === null) {
             self::$operators = [
-                '+' => function ($result, $current) {
+                '+' => static function ($result, $current) {
                     return $result+$current;
                 },
-                '-' => function ($result, $current) {
+                '-' => static function ($result, $current) {
                     return $result-$current;
                 },
-                '*' => function ($result, $current) {
+                '*' => static function ($result, $current) {
                     return $result*$current;
                 },
-                '/' => function ($result, $current) {
+                '/' => static function ($result, $current) {
                     return $result/$current;
                 },
-                '.' => function ($result, $current) {
+                '.' => static function ($result, $current) {
                     return $result.$current;
                 },
             ];
diff --git a/src/Transducer/transducers.php b/src/Transducer/transducers.php
@@ -58,7 +58,7 @@ function transduce(callable $transducer, Termination $reducer, $iterable, $initi
 function map(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Map($reducer, $callback);
         };
     }
@@ -78,7 +78,7 @@ function map(callable $callback, $sequence = null)
 function filter(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Filter($reducer, $callback);
         };
     }
@@ -99,12 +99,12 @@ function filter(callable $callback, $sequence = null)
 function keep(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Keep($reducer, $callback);
         };
     }
     if (is_array($sequence)) {
-        return \array_values(\array_filter($sequence, function ($item) use ($callback) {
+        return \array_values(\array_filter($sequence, static function ($item) use ($callback) {
             return $callback($item) !== null;
         }));
     }
@@ -121,14 +121,14 @@ function keep(callable $callback, $sequence = null)
 function remove(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
-            return new Reducer\Filter($reducer, function ($item) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
+            return new Reducer\Filter($reducer, static function ($item) use ($callback) {
                 return !($callback($item));
             });
         };
     }
     if (is_array($sequence)) {
-        return \array_values(\array_filter($sequence, function ($item) use ($callback) {
+        return \array_values(\array_filter($sequence, static function ($item) use ($callback) {
             return !$callback($item);
         }));
     }
@@ -145,7 +145,7 @@ function remove(callable $callback, $sequence = null)
 function first(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\First($reducer, $callback);
         };
     }
@@ -166,7 +166,7 @@ function first(callable $callback, $sequence = null)
 function cat($sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) {
+        return static function (Reducer $reducer) {
             return new Reducer\Cat($reducer);
         };
     }
@@ -196,7 +196,7 @@ function mapcat(callable $callback, $sequence = null)
 function flatten($sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) {
+        return static function (Reducer $reducer) {
             return new Reducer\Flatten($reducer);
         };
     }
@@ -213,7 +213,7 @@ function flatten($sequence = null)
 function take(int $number, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($number) {
+        return static function (Reducer $reducer) use ($number) {
             return new Reducer\Take($reducer, $number);
         };
     }
@@ -230,7 +230,7 @@ function take(int $number, $sequence = null)
 function take_while(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\TakeWhile($reducer, $callback);
         };
     }
@@ -247,7 +247,7 @@ function take_while(callable $callback, $sequence = null)
 function take_nth(int $frequency, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($frequency) {
+        return static function (Reducer $reducer) use ($frequency) {
             return new Reducer\TakeNth($reducer, $frequency);
         };
     }
@@ -264,7 +264,7 @@ function take_nth(int $frequency, $sequence = null)
 function drop(int $number, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($number) {
+        return static function (Reducer $reducer) use ($number) {
             return new Reducer\Drop($reducer, $number);
         };
     }
@@ -281,7 +281,7 @@ function drop(int $number, $sequence = null)
 function drop_while(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\DropWhile($reducer, $callback);
         };
     }
@@ -299,7 +299,7 @@ function drop_while(callable $callback, $sequence = null)
 function paginate($page = 1, $numberOfItems = 10, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($page, $numberOfItems) {
+        return static function (Reducer $reducer) use ($page, $numberOfItems) {
             return new Reducer\Paginate($reducer, $page, $numberOfItems);
         };
     }
@@ -316,7 +316,7 @@ function paginate($page = 1, $numberOfItems = 10, $sequence = null)
 function replace(array $map, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($map) {
+        return static function (Reducer $reducer) use ($map) {
             return new Reducer\Replace($reducer, $map);
         };
     }
@@ -331,7 +331,7 @@ function replace(array $map, $sequence = null)
 function distinct($sequence = null, ?callable $callback = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Distinct($reducer, $callback);
         };
     }
@@ -346,7 +346,7 @@ function distinct($sequence = null, ?callable $callback = null)
 function dedupe($sequence = null, ?callable $callback = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Dedupe($reducer, $callback);
         };
     }
@@ -363,7 +363,7 @@ function dedupe($sequence = null, ?callable $callback = null)
 function partition(int $size, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($size) {
+        return static function (Reducer $reducer) use ($size) {
             return new Reducer\Partition($reducer, $size);
         };
     }
@@ -380,7 +380,7 @@ function partition(int $size, $sequence = null)
 function partition_by(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\PartitionBy($reducer, $callback);
         };
     }
@@ -397,7 +397,7 @@ function partition_by(callable $callback, $sequence = null)
 function group_by(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\GroupBy($reducer, $callback);
         };
     }
@@ -407,14 +407,14 @@ function group_by(callable $callback, $sequence = null)
 
 /**
  * @param callable $callback
- * @param null|iterable $sequence
+ * @param null $sequence
  *
- * @return null|array|\Closure|mixed
+ * @return array|\Closure|mixed
  */
 function sort(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\Sort($reducer, $callback);
         };
     }
@@ -436,7 +436,7 @@ function sort(callable $callback, $sequence = null)
 function sort_by(callable $callback, $sequence = null)
 {
     if ($sequence === null) {
-        return function (Reducer $reducer) use ($callback) {
+        return static function (Reducer $reducer) use ($callback) {
             return new Reducer\SortBy($reducer, $callback);
         };
     }
diff --git a/src/transform.php b/src/transform.php
@@ -84,7 +84,7 @@ function curry(callable $function, ...$arguments)
      */
     function comparator(callable $callback)
     {
-        return function ($first, $second) use ($callback) {
+        return static function ($first, $second) use ($callback) {
             $first = ($callback)($first);
             $second = ($callback)($second);
             if ($first == $second) {

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ public function __invoke(...$arguments)`
`33`	`33`	`{`
`34`	`34`	`$function = $this->function;`
`35`	`35`
`36`		`- return function (...$args) use ($function, $arguments) {`
`37`		`- return (function ($arguments) use ($function) {`
	`36`	`+ return static function (...$args) use ($function, $arguments) {`
	`37`	`+ return (static function ($arguments) use ($function) {`
`38`	`38`	`if (count($arguments) < (new \ReflectionFunction($function))->getNumberOfRequiredParameters()) {`
`39`	`39`	`return new self($function, ...$arguments);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function transduce(callable $transducer, Termination $reducer, $iterable, $initi`
`58`	`58`	`function map(callable $callback, $sequence = null)`
`59`	`59`	`{`
`60`	`60`	`if ($sequence === null) {`
`61`		`- return function (Reducer $reducer) use ($callback) {`
	`61`	`+ return static function (Reducer $reducer) use ($callback) {`
`62`	`62`	`return new Reducer\Map($reducer, $callback);`
`63`	`63`	`};`
`64`	`64`	`}`
`@@ -78,7 +78,7 @@ function map(callable $callback, $sequence = null)`
`78`	`78`	`function filter(callable $callback, $sequence = null)`
`79`	`79`	`{`
`80`	`80`	`if ($sequence === null) {`
`81`		`- return function (Reducer $reducer) use ($callback) {`
	`81`	`+ return static function (Reducer $reducer) use ($callback) {`
`82`	`82`	`return new Reducer\Filter($reducer, $callback);`
`83`	`83`	`};`
`84`	`84`	`}`
`@@ -99,12 +99,12 @@ function filter(callable $callback, $sequence = null)`
`99`	`99`	`function keep(callable $callback, $sequence = null)`
`100`	`100`	`{`
`101`	`101`	`if ($sequence === null) {`
`102`		`- return function (Reducer $reducer) use ($callback) {`
	`102`	`+ return static function (Reducer $reducer) use ($callback) {`
`103`	`103`	`return new Reducer\Keep($reducer, $callback);`
`104`	`104`	`};`
`105`	`105`	`}`
`106`	`106`	`if (is_array($sequence)) {`
`107`		`- return \array_values(\array_filter($sequence, function ($item) use ($callback) {`
	`107`	`+ return \array_values(\array_filter($sequence, static function ($item) use ($callback) {`
`108`	`108`	`return $callback($item) !== null;`
`109`	`109`	`}));`
`110`	`110`	`}`
`@@ -121,14 +121,14 @@ function keep(callable $callback, $sequence = null)`
`121`	`121`	`function remove(callable $callback, $sequence = null)`
`122`	`122`	`{`
`123`	`123`	`if ($sequence === null) {`
`124`		`- return function (Reducer $reducer) use ($callback) {`
`125`		`- return new Reducer\Filter($reducer, function ($item) use ($callback) {`
	`124`	`+ return static function (Reducer $reducer) use ($callback) {`
	`125`	`+ return new Reducer\Filter($reducer, static function ($item) use ($callback) {`
`126`	`126`	`return !($callback($item));`
`127`	`127`	`});`
`128`	`128`	`};`
`129`	`129`	`}`
`130`	`130`	`if (is_array($sequence)) {`
`131`		`- return \array_values(\array_filter($sequence, function ($item) use ($callback) {`
	`131`	`+ return \array_values(\array_filter($sequence, static function ($item) use ($callback) {`
`132`	`132`	`return !$callback($item);`
`133`	`133`	`}));`
`134`	`134`	`}`
`@@ -145,7 +145,7 @@ function remove(callable $callback, $sequence = null)`
`145`	`145`	`function first(callable $callback, $sequence = null)`
`146`	`146`	`{`
`147`	`147`	`if ($sequence === null) {`
`148`		`- return function (Reducer $reducer) use ($callback) {`
	`148`	`+ return static function (Reducer $reducer) use ($callback) {`
`149`	`149`	`return new Reducer\First($reducer, $callback);`
`150`	`150`	`};`
`151`	`151`	`}`
`@@ -166,7 +166,7 @@ function first(callable $callback, $sequence = null)`
`166`	`166`	`function cat($sequence = null)`
`167`	`167`	`{`
`168`	`168`	`if ($sequence === null) {`
`169`		`- return function (Reducer $reducer) {`
	`169`	`+ return static function (Reducer $reducer) {`
`170`	`170`	`return new Reducer\Cat($reducer);`
`171`	`171`	`};`
`172`	`172`	`}`
`@@ -196,7 +196,7 @@ function mapcat(callable $callback, $sequence = null)`
`196`	`196`	`function flatten($sequence = null)`
`197`	`197`	`{`
`198`	`198`	`if ($sequence === null) {`
`199`		`- return function (Reducer $reducer) {`
	`199`	`+ return static function (Reducer $reducer) {`
`200`	`200`	`return new Reducer\Flatten($reducer);`
`201`	`201`	`};`
`202`	`202`	`}`
`@@ -213,7 +213,7 @@ function flatten($sequence = null)`
`213`	`213`	`function take(int $number, $sequence = null)`
`214`	`214`	`{`
`215`	`215`	`if ($sequence === null) {`
`216`		`- return function (Reducer $reducer) use ($number) {`
	`216`	`+ return static function (Reducer $reducer) use ($number) {`
`217`	`217`	`return new Reducer\Take($reducer, $number);`
`218`	`218`	`};`
`219`	`219`	`}`
`@@ -230,7 +230,7 @@ function take(int $number, $sequence = null)`
`230`	`230`	`function take_while(callable $callback, $sequence = null)`
`231`	`231`	`{`
`232`	`232`	`if ($sequence === null) {`
`233`		`- return function (Reducer $reducer) use ($callback) {`
	`233`	`+ return static function (Reducer $reducer) use ($callback) {`
`234`	`234`	`return new Reducer\TakeWhile($reducer, $callback);`
`235`	`235`	`};`
`236`	`236`	`}`
`@@ -247,7 +247,7 @@ function take_while(callable $callback, $sequence = null)`
`247`	`247`	`function take_nth(int $frequency, $sequence = null)`
`248`	`248`	`{`
`249`	`249`	`if ($sequence === null) {`
`250`		`- return function (Reducer $reducer) use ($frequency) {`
	`250`	`+ return static function (Reducer $reducer) use ($frequency) {`
`251`	`251`	`return new Reducer\TakeNth($reducer, $frequency);`
`252`	`252`	`};`
`253`	`253`	`}`
`@@ -264,7 +264,7 @@ function take_nth(int $frequency, $sequence = null)`
`264`	`264`	`function drop(int $number, $sequence = null)`
`265`	`265`	`{`
`266`	`266`	`if ($sequence === null) {`
`267`		`- return function (Reducer $reducer) use ($number) {`
	`267`	`+ return static function (Reducer $reducer) use ($number) {`
`268`	`268`	`return new Reducer\Drop($reducer, $number);`
`269`	`269`	`};`
`270`	`270`	`}`
`@@ -281,7 +281,7 @@ function drop(int $number, $sequence = null)`
`281`	`281`	`function drop_while(callable $callback, $sequence = null)`
`282`	`282`	`{`
`283`	`283`	`if ($sequence === null) {`
`284`		`- return function (Reducer $reducer) use ($callback) {`
	`284`	`+ return static function (Reducer $reducer) use ($callback) {`
`285`	`285`	`return new Reducer\DropWhile($reducer, $callback);`
`286`	`286`	`};`
`287`	`287`	`}`
`@@ -299,7 +299,7 @@ function drop_while(callable $callback, $sequence = null)`
`299`	`299`	`function paginate($page = 1, $numberOfItems = 10, $sequence = null)`
`300`	`300`	`{`
`301`	`301`	`if ($sequence === null) {`
`302`		`- return function (Reducer $reducer) use ($page, $numberOfItems) {`
	`302`	`+ return static function (Reducer $reducer) use ($page, $numberOfItems) {`
`303`	`303`	`return new Reducer\Paginate($reducer, $page, $numberOfItems);`
`304`	`304`	`};`
`305`	`305`	`}`
`@@ -316,7 +316,7 @@ function paginate($page = 1, $numberOfItems = 10, $sequence = null)`
`316`	`316`	`function replace(array $map, $sequence = null)`
`317`	`317`	`{`
`318`	`318`	`if ($sequence === null) {`
`319`		`- return function (Reducer $reducer) use ($map) {`
	`319`	`+ return static function (Reducer $reducer) use ($map) {`
`320`	`320`	`return new Reducer\Replace($reducer, $map);`
`321`	`321`	`};`
`322`	`322`	`}`
`@@ -331,7 +331,7 @@ function replace(array $map, $sequence = null)`
`331`	`331`	`function distinct($sequence = null, ?callable $callback = null)`
`332`	`332`	`{`
`333`	`333`	`if ($sequence === null) {`
`334`		`- return function (Reducer $reducer) use ($callback) {`
	`334`	`+ return static function (Reducer $reducer) use ($callback) {`
`335`	`335`	`return new Reducer\Distinct($reducer, $callback);`
`336`	`336`	`};`
`337`	`337`	`}`
`@@ -346,7 +346,7 @@ function distinct($sequence = null, ?callable $callback = null)`
`346`	`346`	`function dedupe($sequence = null, ?callable $callback = null)`
`347`	`347`	`{`
`348`	`348`	`if ($sequence === null) {`
`349`		`- return function (Reducer $reducer) use ($callback) {`
	`349`	`+ return static function (Reducer $reducer) use ($callback) {`
`350`	`350`	`return new Reducer\Dedupe($reducer, $callback);`
`351`	`351`	`};`
`352`	`352`	`}`
`@@ -363,7 +363,7 @@ function dedupe($sequence = null, ?callable $callback = null)`
`363`	`363`	`function partition(int $size, $sequence = null)`
`364`	`364`	`{`
`365`	`365`	`if ($sequence === null) {`
`366`		`- return function (Reducer $reducer) use ($size) {`
	`366`	`+ return static function (Reducer $reducer) use ($size) {`
`367`	`367`	`return new Reducer\Partition($reducer, $size);`
`368`	`368`	`};`
`369`	`369`	`}`
`@@ -380,7 +380,7 @@ function partition(int $size, $sequence = null)`
`380`	`380`	`function partition_by(callable $callback, $sequence = null)`
`381`	`381`	`{`
`382`	`382`	`if ($sequence === null) {`
`383`		`- return function (Reducer $reducer) use ($callback) {`
	`383`	`+ return static function (Reducer $reducer) use ($callback) {`
`384`	`384`	`return new Reducer\PartitionBy($reducer, $callback);`
`385`	`385`	`};`
`386`	`386`	`}`
`@@ -397,7 +397,7 @@ function partition_by(callable $callback, $sequence = null)`
`397`	`397`	`function group_by(callable $callback, $sequence = null)`
`398`	`398`	`{`
`399`	`399`	`if ($sequence === null) {`
`400`		`- return function (Reducer $reducer) use ($callback) {`
	`400`	`+ return static function (Reducer $reducer) use ($callback) {`
`401`	`401`	`return new Reducer\GroupBy($reducer, $callback);`
`402`	`402`	`};`
`403`	`403`	`}`
`@@ -407,14 +407,14 @@ function group_by(callable $callback, $sequence = null)`
`407`	`407`
`408`	`408`	`/**`
`409`	`409`	`* @param callable $callback`
`410`		`- * @param null\|iterable $sequence`
	`410`	`+ * @param null $sequence`
`411`	`411`	`*`
`412`		`- * @return null\|array\|\Closure\|mixed`
	`412`	`+ * @return array\|\Closure\|mixed`
`413`	`413`	`*/`
`414`	`414`	`function sort(callable $callback, $sequence = null)`
`415`	`415`	`{`
`416`	`416`	`if ($sequence === null) {`
`417`		`- return function (Reducer $reducer) use ($callback) {`
	`417`	`+ return static function (Reducer $reducer) use ($callback) {`
`418`	`418`	`return new Reducer\Sort($reducer, $callback);`
`419`	`419`	`};`
`420`	`420`	`}`
`@@ -436,7 +436,7 @@ function sort(callable $callback, $sequence = null)`
`436`	`436`	`function sort_by(callable $callback, $sequence = null)`
`437`	`437`	`{`
`438`	`438`	`if ($sequence === null) {`
`439`		`- return function (Reducer $reducer) use ($callback) {`
	`439`	`+ return static function (Reducer $reducer) use ($callback) {`
`440`	`440`	`return new Reducer\SortBy($reducer, $callback);`
`441`	`441`	`};`
`442`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ function curry(callable $function, ...$arguments)`
`84`	`84`	`*/`
`85`	`85`	`function comparator(callable $callback)`
`86`	`86`	`{`
`87`		`- return function ($first, $second) use ($callback) {`
	`87`	`+ return static function ($first, $second) use ($callback) {`
`88`	`88`	`$first = ($callback)($first);`
`89`	`89`	`$second = ($callback)($second);`
`90`	`90`	`if ($first == $second) {`