Support for PHP 8.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.8.0 - UPCOMING
+
+* Support for PHP 8.0.
+
 ## 2.5.0 - 2019-12-30
 
 * Full support for PHP 7.0-7.4.

composer.json

@@ -13,13 +13,13 @@
   ],
 
   "require": {
-    "php": ">=5.4.0",
+    "php": "^5.4 || ^7.0 || ^8.0",
     "symfony/polyfill-mbstring": "^1.17"
   },
 
   "require-dev": {
     "composer/xdebug-handler": "^1.4",
-    "phpunit/phpunit": "^4.8.36|^7.5.15"
+    "phpunit/phpunit": "^4.8.36 || ^7.5.15"
   },
 
   "autoload": {

src/FnDispatcher.php

@@ -45,7 +45,7 @@ private function fn_avg(array $args)
     {
         $this->validate('avg', $args, [['array']]);
         $sum = $this->reduce('avg:0', $args[0], ['number'], function ($a, $b) {
-            return $a + $b;
+            return Utils::add($a, $b);
         });
         return $args[0] ? ($sum / count($args[0])) : null;
     }
@@ -172,7 +172,7 @@ private function fn_sum(array $args)
     {
         $this->validate('sum', $args, [['array']]);
         $fn = function ($a, $b) {
-            return $a + $b;
+            return Utils::add($a, $b);
         };
         return $this->reduce('sum:0', $args[0], ['number'], $fn);
     }

src/Utils.php

@@ -126,6 +126,31 @@ public static function isEqual($a, $b)
         }
     }
 
+    /**
+     * Safely add together two values.
+     *
+     * @param mixed $a First value to add
+     * @param mixed $b Second value to add
+     *
+     * @return int|float
+     */
+    public static function add($a, $b)
+    {
+        if (is_numeric($a)) {
+            if (is_numeric($b)) {
+                return $a + $b;
+            } else {
+                return $a;
+            }
+        } else {
+            if (is_numeric($b)) {
+                return $b;
+            } else {
+                return 0;
+            }
+        }
+    }
+
     /**
      * JMESPath requires a stable sorting algorithm, so here we'll implement
      * a simple Schwartzian transform that uses array index positions as tie