Avoid `func` prefix in function name

As decided in
https://github.com/PHPOffice/PhpSpreadsheet/pull/1954#issuecomment-809824463
This commit is contained in:
Adrien Crivelli 2021-05-14 20:47:17 +09:00
parent 4bd506b414
commit ac5b96d0f1
No known key found for this signature in database
GPG Key ID: 16D79B903B4B5874
5 changed files with 8 additions and 8 deletions

View File

@ -2314,7 +2314,7 @@ class Calculation
], ],
'SUM' => [ 'SUM' => [
'category' => Category::CATEGORY_MATH_AND_TRIG, 'category' => Category::CATEGORY_MATH_AND_TRIG,
'functionCall' => [MathTrig\Sum::class, 'funcSumNoStrings'], 'functionCall' => [MathTrig\Sum::class, 'sumErroringStrings'],
'argumentCount' => '1+', 'argumentCount' => '1+',
], ],
'SUMIF' => [ 'SUMIF' => [

View File

@ -38,7 +38,7 @@ class DSum extends DatabaseAbstract
return null; return null;
} }
return MathTrig\Sum::funcSum( return MathTrig\Sum::sumIgnoringStrings(
self::getFilteredColumn($database, $field, $criteria) self::getFilteredColumn($database, $field, $criteria)
); );
} }

View File

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

View File

@ -60,7 +60,7 @@ class Subtotal
[Product::class, 'evaluate'], // 6 [Product::class, 'evaluate'], // 6
[Statistical\StandardDeviations::class, 'STDEV'], // 7 [Statistical\StandardDeviations::class, 'STDEV'], // 7
[Statistical\StandardDeviations::class, 'STDEVP'], // 8 [Statistical\StandardDeviations::class, 'STDEVP'], // 8
[Sum::class, 'funcSum'], // 9 [Sum::class, 'sumIgnoringStrings'], // 9
[Statistical\Variances::class, 'VAR'], // 10 [Statistical\Variances::class, 'VAR'], // 10
[Statistical\Variances::class, 'VARP'], // 11 [Statistical\Variances::class, 'VARP'], // 11
]; ];

View File

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