PHPStan Level 4 fixes (#198)

szepeviktor · lstrojny · commit 32593a664e02 · 2019-11-29T01:20:22.000+01:00
diff --git a/src/Functional/Concat.php b/src/Functional/Concat.php
@@ -27,7 +27,7 @@
 /**
  * Concatenates zero or more strings
  *
- * @param string[] $strings
+ * @param string[] ...$strings
  * @return string
  */
 function concat(string ...$strings)
diff --git a/src/Functional/Curry.php b/src/Functional/Curry.php
@@ -39,6 +39,7 @@
 function curry(callable $function, $required = true)
 {
     if (\method_exists('Closure', 'fromCallable')) {
+        // Closure::fromCallable was introduced in PHP 7.1
         $reflection = new ReflectionFunction(Closure::fromCallable($function));
     } else {
         if (\is_string($function) && \strpos($function, '::', 1) !== false) {
diff --git a/src/Functional/DropLast.php b/src/Functional/DropLast.php
@@ -31,7 +31,7 @@
  * Drop all elements from a collection after callback returns true
  *
  * @param Traversable|array $collection
- * @param callable|integer $callback
+ * @param callable $callback
  * @return array
  */
 function drop_last($collection, callable $callback)
diff --git a/src/Functional/Exceptions/InvalidArgumentException.php b/src/Functional/Exceptions/InvalidArgumentException.php
@@ -27,7 +27,7 @@
 class InvalidArgumentException extends \InvalidArgumentException
 {
     /**
-     * @param callable $callback
+     * @param mixed $callback
      * @param string $callee
      * @param integer $parameterPosition
      * @throws InvalidArgumentException
@@ -103,7 +103,7 @@ public static function assertMethodName($methodName, $callee, $parameterPosition
     }
 
     /**
-     * @param string|int|float|null $propertyName
+     * @param mixed $propertyName
      * @param string $callee
      * @param integer $parameterPosition
      * @throws InvalidArgumentException
@@ -202,7 +202,7 @@ public static function assertBoolean($value, $callee, $parameterPosition)
     }
 
     /**
-     * @param boolean $value
+     * @param mixed $value
      * @param string $callee
      * @param integer $parameterPosition
      * @throws InvalidArgumentException
@@ -273,7 +273,7 @@ public static function assertResolvablePlaceholder(array $args, $position)
     }
 
     /**
-     * @param $collection
+     * @param mixed $collection
      * @param string $className
      * @param string $callee
      * @param integer $parameterPosition
diff --git a/src/Functional/GreaterThan.php b/src/Functional/GreaterThan.php
@@ -28,7 +28,7 @@
  * Returns true if $a is strictly greater than $b.
  *
  * @param mixed $b
- * @return bool
+ * @return \Closure(mixed)
  */
 function greater_than($b)
 {
diff --git a/src/Functional/GreaterThanOrEqual.php b/src/Functional/GreaterThanOrEqual.php
@@ -28,7 +28,7 @@
  * Returns true if $a is greater than or equal to $b.
  *
  * @param mixed $b
- * @return bool
+ * @return \Closure(mixed)
  */
 function greater_than_or_equal($b)
 {
diff --git a/src/Functional/LessThan.php b/src/Functional/LessThan.php
@@ -28,7 +28,7 @@
  * Returns true if $a is strictly less than $b.
  *
  * @param mixed $b
- * @return bool
+ * @return \Closure(mixed)
  */
 function less_than($b)
 {
diff --git a/src/Functional/LessThanOrEqual.php b/src/Functional/LessThanOrEqual.php
@@ -28,7 +28,7 @@
  * Returns true if $a is less than or equal to $b.
  *
  * @param mixed $b
- * @return bool
+ * @return \Closure(mixed)
  */
 function less_than_or_equal($b)
 {
diff --git a/src/Functional/LexicographicCompare.php b/src/Functional/LexicographicCompare.php
@@ -29,7 +29,7 @@
  * $a is respectively less than, equal to, or greater than $b.
  *
  * @param mixed $b
- * @return bool
+ * @return \Closure(mixed)
  */
 function lexicographic_compare($b)
 {
diff --git a/src/Functional/PartialLeft.php b/src/Functional/PartialLeft.php
@@ -30,7 +30,7 @@
  * Use Functional\…, Functional\…() or Functional\placeholder() as a placeholder
  *
  * @param callable $callback
- * @param array $arguments
+ * @param array ...$arguments
  * @return callable
  */
 function partial_left(callable $callback, ...$arguments)
diff --git a/src/Functional/PartialRight.php b/src/Functional/PartialRight.php
@@ -28,7 +28,7 @@
  * Return a new function with the arguments partially applied starting from the right
  *
  * @param callable $callback
- * @param array $arguments
+ * @param array ...$arguments
  * @return callable
  */
 function partial_right(callable $callback, ...$arguments)
diff --git a/src/Functional/Partition.php b/src/Functional/Partition.php
@@ -44,6 +44,7 @@ function partition($collection, callable ...$callbacks)
 {
     InvalidArgumentException::assertCollection($collection, __FUNCTION__, 1);
 
+    $partition = 0;
     $partitions = \array_fill(0, \count($callbacks) + 1, []);
 
     foreach ($collection as $index => $element) {
diff --git a/src/Functional/TailRecursion.php b/src/Functional/TailRecursion.php
@@ -5,8 +5,8 @@
 /**
  * Decorates given function with tail recursion optimization.
  *
- * I took solution here https://gist.github.com/beberlei/4145442
- * but reworked it and make without classes.
+ * I took the solution from here https://gist.github.com/beberlei/4145442
+ * but reworked it and made without classes.
  *
  * @param callable $fn
  * @return callable
diff --git a/src/Functional/Zip.php b/src/Functional/Zip.php
@@ -30,7 +30,7 @@
 /**
  * Recombines arrays by index and applies a callback optionally
  *
- * @param $args array|Traversable $collection One or more callbacks
+ * @param array|Traversable ...$args One or more callbacks
  * @return array
  */
 function zip(...$args)
diff --git a/src/Functional/ZipAll.php b/src/Functional/ZipAll.php
@@ -33,7 +33,7 @@
  * When the input collections are different lengths the resulting collections
  * will all have the length which is required to fit all the keys
  *
- * @param $args array|Traversable $collection One or more callbacks
+ * @param array|Traversable ...$args One or more callbacks
  * @return array
  */
 function zip_all(...$args)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`/**`
`28`	`28`	`* Concatenates zero or more strings`
`29`	`29`	`*`
`30`		`- * @param string[] $strings`
	`30`	`+ * @param string[] ...$strings`
`31`	`31`	`* @return string`
`32`	`32`	`*/`
`33`	`33`	`function concat(string ...$strings)`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`function curry(callable $function, $required = true)`
`40`	`40`	`{`
`41`	`41`	`if (\method_exists('Closure', 'fromCallable')) {`
	`42`	`+ // Closure::fromCallable was introduced in PHP 7.1`
`42`	`43`	`$reflection = new ReflectionFunction(Closure::fromCallable($function));`
`43`	`44`	`} else {`
`44`	`45`	`if (\is_string($function) && \strpos($function, '::', 1) !== false) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* Drop all elements from a collection after callback returns true`
`32`	`32`	`*`
`33`	`33`	`* @param Traversable\|array $collection`
`34`		`- * @param callable\|integer $callback`
	`34`	`+ * @param callable $callback`
`35`	`35`	`* @return array`
`36`	`36`	`*/`
`37`	`37`	`function drop_last($collection, callable $callback)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* Returns true if $a is strictly greater than $b.`
`29`	`29`	`*`
`30`	`30`	`* @param mixed $b`
`31`		`- * @return bool`
	`31`	`+ * @return \Closure(mixed)`
`32`	`32`	`*/`
`33`	`33`	`function greater_than($b)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* $a is respectively less than, equal to, or greater than $b.`
`30`	`30`	`*`
`31`	`31`	`* @param mixed $b`
`32`		`- * @return bool`
	`32`	`+ * @return \Closure(mixed)`
`33`	`33`	`*/`
`34`	`34`	`function lexicographic_compare($b)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* Use Functional\…, Functional\…() or Functional\placeholder() as a placeholder`
`31`	`31`	`*`
`32`	`32`	`* @param callable $callback`
`33`		`- * @param array $arguments`
	`33`	`+ * @param array ...$arguments`
`34`	`34`	`* @return callable`
`35`	`35`	`*/`
`36`	`36`	`function partial_left(callable $callback, ...$arguments)`