Fix initial errors (#208)

.gitignore

@@ -4,3 +4,4 @@ vendor/
 composer.lock
 phpcs.xml
 phpunit.xml
+/lsp/

.travis.yml

@@ -15,3 +15,4 @@ install:
 script:
   - composer tests
   - composer coding-style
+  - composer types

composer.json

@@ -15,7 +15,8 @@
         }
     ],
     "require": {
-        "php": "~7"
+        "php": "~7",
+        "vimeo/psalm": "^3.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~7",
@@ -123,6 +124,7 @@
     },
     "scripts": {
         "tests": "vendor/bin/phpunit",
+        "types": "vendor/bin/psalm",
         "coding-style": "vendor/bin/phpcs && vendor/bin/php-cs-fixer fix --dry-run --diff --config=.php_cs.dist",
         "clear": "rm -rf vendor/"
     }

psalm.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="false"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info" />
+
+        <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->
+
+        <DeprecatedMethod errorLevel="info" />
+        <DeprecatedProperty errorLevel="info" />
+        <DeprecatedClass errorLevel="info" />
+        <DeprecatedConstant errorLevel="info" />
+        <DeprecatedFunction errorLevel="info" />
+        <DeprecatedInterface errorLevel="info" />
+        <DeprecatedTrait errorLevel="info" />
+
+        <InternalMethod errorLevel="info" />
+        <InternalProperty errorLevel="info" />
+        <InternalClass errorLevel="info" />
+
+        <MissingClosureReturnType errorLevel="info" />
+        <MissingReturnType errorLevel="info" />
+        <MissingPropertyType errorLevel="info" />
+        <InvalidDocblock errorLevel="info" />
+        <MisplacedRequiredParam errorLevel="info" />
+
+        <PropertyNotSetInConstructor errorLevel="info" />
+        <MissingConstructor errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
+
+        <RedundantCondition errorLevel="info" />
+
+        <DocblockTypeContradiction errorLevel="info" />
+        <RedundantConditionGivenDocblockType errorLevel="info" />
+
+        <UnresolvableInclude errorLevel="info" />
+
+        <RawObjectIteration errorLevel="info" />
+
+        <InvalidStringClass errorLevel="info" />
+    </issueHandlers>
+</psalm>

src/Functional/Average.php

@@ -17,7 +17,7 @@
  * Returns the average of all numeric values in the array or null if no numeric value was found
  *
  * @param Traversable|array $collection
- * @return null|float|int
+ * @return numeric|null
  */
 function average($collection)
 {
@@ -28,7 +28,7 @@ function average($collection)
 
     foreach ($collection as $element) {
         if (\is_numeric($element)) {
-            $sum += $element;
+            $sum = ($sum === null) ? $element : $sum + $element;
             ++$divisor;
         }
     }

src/Functional/Concat.php

@@ -13,7 +13,7 @@
 /**
  * Concatenates zero or more strings
  *
- * @param string[] ...$strings
+ * @param array<array-key, string> $strings
  * @return string
  */
 function concat(string ...$strings)

src/Functional/Curry.php

@@ -24,8 +24,10 @@
  */
 function curry(callable $function, $required = true)
 {
+    /** @psalm-suppress ArgumentTypeCoercion */
     if (\method_exists('Closure', 'fromCallable')) {
         // Closure::fromCallable was introduced in PHP 7.1
+        /** @psalm-suppress InvalidArgument */
         $reflection = new ReflectionFunction(Closure::fromCallable($function));
     } else {
         if (\is_string($function) && \strpos($function, '::', 1) !== false) {
@@ -35,6 +37,7 @@ function curry(callable $function, $required = true)
         } elseif (\is_object($function) && \method_exists($function, '__invoke')) {
             $reflection = new ReflectionMethod($function, '__invoke');
         } else {
+            /** @psalm-suppress InvalidArgument */
             $reflection = new ReflectionFunction($function);
         }
     }

src/Functional/Difference.php

@@ -17,8 +17,8 @@
  * Takes a collection and returns the difference of all elements
  *
  * @param Traversable|array $collection
- * @param integer|float $initial
- * @return integer|float
+ * @param numeric $initial
+ * @return numeric
  */
 function difference($collection, $initial = 0)
 {

src/Functional/Exceptions/InvalidArgumentException.php

@@ -22,7 +22,7 @@ public static function assertCallback($callback, $callee, $parameterPosition)
     {
         if (!\is_callable($callback)) {
             if (!\is_array($callback) && !\is_string($callback)) {
-                throw new static(
+                throw new self(
                     \sprintf(
                         '%s() expected parameter %d to be a valid callback, no array, string, closure or functor given',
                         $callee,
@@ -43,15 +43,15 @@ public static function assertCallback($callback, $callee, $parameterPosition)
                         $sep = '->';
                     }
 
-                    $callback = \implode($callback, $sep);
+                    $callback = \implode($sep, $callback);
                     break;
 
                 default:
                     $type = 'function';
                     break;
             }
 
-            throw new static(
+            throw new self(
                 \sprintf(
                     "%s() expects parameter %d to be a valid callback, %s '%s' not found or invalid %s name",
                     $callee,
@@ -77,7 +77,7 @@ public static function assertArrayAccess($collection, $callee, $parameterPositio
     public static function assertMethodName($methodName, $callee, $parameterPosition)
     {
         if (!\is_string($methodName)) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be string, %s given',
                     $callee,
@@ -102,7 +102,7 @@ public static function assertPropertyName($propertyName, $callee, $parameterPosi
             !\is_float($propertyName) &&
             !\is_null($propertyName)
         ) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be a valid property name or array index, %s given',
                     $callee,
@@ -119,7 +119,7 @@ public static function assertPositiveInteger($value, $callee, $parameterPosition
             $type = self::getType($value);
             $type = $type === 'integer' ? 'negative integer' : $type;
 
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be positive integer, %s given',
                     $callee,
@@ -133,7 +133,7 @@ public static function assertPositiveInteger($value, $callee, $parameterPosition
     /**
      * @param mixed $key
      * @param string $callee
-     * @throws static
+     * @throws InvalidArgumentException
      */
     public static function assertValidArrayKey($key, $callee)
     {
@@ -142,7 +142,7 @@ public static function assertValidArrayKey($key, $callee)
         $keyType = \gettype($key);
 
         if (!\in_array($keyType, $keyTypes, true)) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s(): callback returned invalid array key of type "%s". Expected %4$s or %3$s',
                     $callee,
@@ -157,7 +157,7 @@ public static function assertValidArrayKey($key, $callee)
     public static function assertArrayKeyExists($collection, $key, $callee)
     {
         if (!isset($collection[$key])) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s(): unknown key "%s"',
                     $callee,
@@ -176,7 +176,7 @@ public static function assertArrayKeyExists($collection, $key, $callee)
     public static function assertBoolean($value, $callee, $parameterPosition)
     {
         if (!\is_bool($value)) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be boolean, %s given',
                     $callee,
@@ -196,7 +196,7 @@ public static function assertBoolean($value, $callee, $parameterPosition)
     public static function assertInteger($value, $callee, $parameterPosition)
     {
         if (!\is_int($value)) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be integer, %s given',
                     $callee,
@@ -217,7 +217,7 @@ public static function assertInteger($value, $callee, $parameterPosition)
     public static function assertIntegerGreaterThanOrEqual($value, $limit, $callee, $parameterPosition)
     {
         if (!\is_int($value) || $value < $limit) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be an integer greater than or equal to %d',
                     $callee,
@@ -238,7 +238,7 @@ public static function assertIntegerGreaterThanOrEqual($value, $limit, $callee,
     public static function assertIntegerLessThanOrEqual($value, $limit, $callee, $parameterPosition)
     {
         if (!\is_int($value) || $value > $limit) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be an integer less than or equal to %d',
                     $callee,
@@ -252,7 +252,7 @@ public static function assertIntegerLessThanOrEqual($value, $limit, $callee, $pa
     public static function assertResolvablePlaceholder(array $args, $position)
     {
         if (\count($args) === 0) {
-            throw new static(
+            throw new self(
                 \sprintf('Cannot resolve parameter placeholder at position %d. Parameter stack is empty.', $position)
             );
         }
@@ -268,7 +268,7 @@ public static function assertResolvablePlaceholder(array $args, $position)
     private static function assertCollectionAlike($collection, $className, $callee, $parameterPosition)
     {
         if (!\is_array($collection) && !$collection instanceof $className) {
-            throw new static(
+            throw new self(
                 \sprintf(
                     '%s() expects parameter %d to be array or instance of %s, %s given',
                     $callee,

src/Functional/Match.php

@@ -21,7 +21,7 @@
  *
  * @param array $conditions the conditions to check against
  *
- * @return callable|null the function that calls the callable of the first truthy condition
+ * @return callable the function that calls the callable of the first truthy condition
  */
 function match(array $conditions)
 {

src/Functional/Maximum.php

@@ -17,7 +17,7 @@
  * Returns the maximum value of a collection
  *
  * @param Traversable|array $collection
- * @return integer|float
+ * @return numeric|null
  */
 function maximum($collection)
 {

src/Functional/Minimum.php

@@ -17,7 +17,7 @@
  * Returns the minimum value of a collection
  *
  * @param Traversable|array $collection
- * @return integer|float
+ * @return numeric|null
  */
 function minimum($collection)
 {

src/Functional/Poll.php

@@ -33,6 +33,7 @@ function poll(callable $callback, $timeout, Traversable $delaySequence = null)
 
     $delays = new AppendIterator();
     if ($delaySequence) {
+        /** @psalm-suppress ArgumentTypeCoercion */
         $delays->append(new InfiniteIterator($delaySequence));
     }
     $delays->append(new InfiniteIterator(new ArrayIterator([0])));

src/Functional/Product.php

@@ -17,8 +17,8 @@
  * Takes a collection and returns the product of all elements
  *
  * @param Traversable|array $collection
- * @param integer|float $initial
- * @return integer|float
+ * @param numeric $initial
+ * @return numeric
  */
 function product($collection, $initial = 1)
 {

src/Functional/Retry.php

@@ -34,6 +34,7 @@ function retry(callable $callback, $retries, Traversable $delaySequence = null)
 
     if ($delaySequence) {
         $delays = new AppendIterator();
+        /** @psalm-suppress ArgumentTypeCoercion */
         $delays->append(new InfiniteIterator($delaySequence));
         $delays->append(new InfiniteIterator(new ArrayIterator([0])));
         $delays = new LimitIterator($delays, $retries);

src/Functional/Sum.php

@@ -17,8 +17,8 @@
  * Takes a collection and returns the sum of the elements
  *
  * @param Traversable|array $collection
- * @param integer|float $initial
- * @return integer|float
+ * @param numeric $initial
+ * @return numeric
  */
 function sum($collection, $initial = 0)
 {

src/Functional/ZipAll.php

@@ -27,6 +27,7 @@ function zip_all(...$args)
     /** @var callable|null $callback */
     $callback = null;
     if (\is_callable(\end($args))) {
+        /** @var callable $callback */
         $callback = \array_pop($args);
     }