Fix baseRest implementation

pierredup · pierredup · commit e6dd1b9b95b4 · 2018-12-10T23:41:44.000+02:00
diff --git a/src/Array/without.php b/src/Array/without.php
@@ -34,5 +34,5 @@
  */
 function without(array $array, ...$values): array
 {
-    return baseRest('\_\difference')($array, $values);
+    return baseRest('\_\difference')($array, ...$values);
 }
diff --git a/src/Array/zip.php b/src/Array/zip.php
@@ -31,5 +31,5 @@
  */
 function zip(array ...$arrays): array
 {
-    return baseRest('\_\unzip')($arrays);
+    return baseRest('\_\unzip')(...$arrays);
 }
diff --git a/src/Collection/invokeMap.php b/src/Collection/invokeMap.php
@@ -47,5 +47,5 @@ function invokeMap(iterable $collection, $path, array $args = []): array
         });
 
         return $result;
-    })($collection, $path, $args);
+    })($collection, $path, ...$args);
 }
diff --git a/src/Function/overArgs.php b/src/Function/overArgs.php
@@ -58,7 +58,7 @@ function overArgs(callable $func, array $transforms): callable
 
         $funcsLength = \count($transforms);
 
-        return baseRest(function (...$args) use ($funcsLength, $transforms, $func) {
+        return baseRest(function ($args) use ($funcsLength, $transforms, $func) {
             $index = -1;
             $length = \min(\count($args), $funcsLength);
 
diff --git a/src/Function/spread.php b/src/Function/spread.php
@@ -45,7 +45,7 @@ function spread(callable $func, ?int $start = null)
 {
     $start = null === $start ? 0 : \max($start, 0);
 
-    return baseRest(function (...$args) use ($start, $func) {
+    return baseRest(function ($args) use ($start, $func) {
         $array = $args[$start];
         $otherArgs = castSlice($args, 0, $start);
 
diff --git a/src/Object/pick.php b/src/Object/pick.php
@@ -32,7 +32,7 @@
  */
 function pick($object, $paths): \stdClass
 {
-    return flatRest(function ($object, ...$paths) {
+    return flatRest(function ($object, $paths) {
         return basePick($object, $paths);
     })($object, $paths);
 }
diff --git a/src/internal/overRest.php b/src/internal/overRest.php
@@ -13,7 +13,8 @@
 
 function overRest(callable $func, $start, callable $transform): callable
 {
-    $start = max($start ?? -1, 0);
+    $parameters = (new \ReflectionFunction($func))->getNumberOfParameters();
+    $start = max($start ?? $parameters - 1, 0);
 
     return function () use ($func, $start, $transform) {
         $args = \func_get_args();
@@ -31,6 +32,6 @@ function overRest(callable $func, $start, callable $transform): callable
         }
         $otherArgs[$start] = $transform($array);
 
-        return $func(...$otherArgs[$start]);
+        return $func(...$otherArgs);
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@`
`34`	`34`	`*/`
`35`	`35`	`function without(array $array, ...$values): array`
`36`	`36`	`{`
`37`		`- return baseRest('\_\difference')($array, $values);`
	`37`	`+ return baseRest('\_\difference')($array, ...$values);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@`
`31`	`31`	`*/`
`32`	`32`	`function zip(array ...$arrays): array`
`33`	`33`	`{`
`34`		`- return baseRest('\_\unzip')($arrays);`
	`34`	`+ return baseRest('\_\unzip')(...$arrays);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ function invokeMap(iterable $collection, $path, array $args = []): array`
`47`	`47`	`});`
`48`	`48`
`49`	`49`	`return $result;`
`50`		`- })($collection, $path, $args);`
	`50`	`+ })($collection, $path, ...$args);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ function spread(callable $func, ?int $start = null)`
`45`	`45`	`{`
`46`	`46`	`$start = null === $start ? 0 : \max($start, 0);`
`47`	`47`
`48`		`- return baseRest(function (...$args) use ($start, $func) {`
	`48`	`+ return baseRest(function ($args) use ($start, $func) {`
`49`	`49`	`$array = $args[$start];`
`50`	`50`	`$otherArgs = castSlice($args, 0, $start);`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`*/`
`33`	`33`	`function pick($object, $paths): \stdClass`
`34`	`34`	`{`
`35`		`- return flatRest(function ($object, ...$paths) {`
	`35`	`+ return flatRest(function ($object, $paths) {`
`36`	`36`	`return basePick($object, $paths);`
`37`	`37`	`})($object, $paths);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`
`14`	`14`	`function overRest(callable $func, $start, callable $transform): callable`
`15`	`15`	`{`
`16`		`- $start = max($start ?? -1, 0);`
	`16`	`+ $parameters = (new \ReflectionFunction($func))->getNumberOfParameters();`
	`17`	`+ $start = max($start ?? $parameters - 1, 0);`
`17`	`18`
`18`	`19`	`return function () use ($func, $start, $transform) {`
`19`	`20`	`$args = \func_get_args();`
`@@ -31,6 +32,6 @@ function overRest(callable $func, $start, callable $transform): callable`
`31`	`32`	`}`
`32`	`33`	`$otherArgs[$start] = $transform($array);`
`33`	`34`
`34`		`- return $func(...$otherArgs[$start]);`
	`35`	`+ return $func(...$otherArgs);`
`35`	`36`	`};`
`36`	`37`	`}`