Avoid func prefix in function name

As decided in #1954 (comment)
PHPOffice · May 14, 2021 · ac5b96d · ac5b96d
1 parent 4bd506b
commit ac5b96d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2314,7 +2314,7 @@ class Calculation
         ],
         'SUM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig\Sum::class, 'funcSumNoStrings'],
+            'functionCall' => [MathTrig\Sum::class, 'sumErroringStrings'],
             'argumentCount' => '1+',
         ],
         'SUMIF' => [

diff --git a/src/PhpSpreadsheet/Calculation/Database/DSum.php b/src/PhpSpreadsheet/Calculation/Database/DSum.php
@@ -38,7 +38,7 @@ public static function evaluate($database, $field, $criteria)
             return null;
         }
 
-        return MathTrig\Sum::funcSum(
+        return MathTrig\Sum::sumIgnoringStrings(
             self::getFilteredColumn($database, $field, $criteria)
         );
     }

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -771,8 +771,8 @@ public static function SUBTOTAL($functionType, ...$args)
      *
      * @Deprecated 1.18.0
      *
-     * @See MathTrig\Sum::funcSumNoStrings()
-     *      Use the funcSumNoStrings method in the MathTrig\Sum class instead
+     * @See MathTrig\Sum::sumErroringStrings()
+     *      Use the sumErroringStrings method in the MathTrig\Sum class instead
      *
      * Excel Function:
      *        SUM(value1[,value2[, ...]])
@@ -783,7 +783,7 @@ public static function SUBTOTAL($functionType, ...$args)
      */
     public static function SUM(...$args)
     {
-        return MathTrig\Sum::funcSum(...$args);
+        return MathTrig\Sum::sumIgnoringStrings(...$args);
     }
 
     /**

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php b/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
@@ -60,7 +60,7 @@ function ($index) use ($cellReference) {
         [Product::class, 'evaluate'], // 6
         [Statistical\StandardDeviations::class, 'STDEV'], // 7
         [Statistical\StandardDeviations::class, 'STDEVP'], // 8
-        [Sum::class, 'funcSum'], // 9
+        [Sum::class, 'sumIgnoringStrings'], // 9
         [Statistical\Variances::class, 'VAR'], // 10
         [Statistical\Variances::class, 'VARP'], // 11
     ];

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php b/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
@@ -18,7 +18,7 @@ class Sum
      *
      * @return float|string
      */
-    public static function funcSum(...$args)
+    public static function sumIgnoringStrings(...$args)
     {
         $returnValue = 0;
 
@@ -47,7 +47,7 @@ public static function funcSum(...$args)
      *
      * @return float|string
      */
-    public static function funcSumNoStrings(...$args)
+    public static function sumErroringStrings(...$args)
     {
         $returnValue = 0;
         // Loop through the arguments