Fix a SUMIF warning when having different length of arrays provided a…

…s input Closes PHPOffice#873
guillaume-ro-fr · Jun 12, 2019 · 8a40a05 · 8a40a05
1 parent 2b6d76b
commit 8a40a05
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Whitelist `tsv` extension when opening CSV files [#429](https://github.com/PHPOffice/PhpSpreadsheet/issues/429)
+- Fix a SUMIF warning with some versions of PHP when having different length of arrays provided as input [#873](https://github.com/PHPOffice/PhpSpreadsheet/pull/873)
 
 ## [1.7.0] - 2019-05-26
 

diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -1224,11 +1224,12 @@ public static function SUMIF($aArgs, $condition, $sumArgs = [])
             }
 
             $testCondition = '=' . $arg . $condition;
+            $sumValue = array_key_exists($key, $sumArgs) ? $sumArgs[$key] : 0;
 
-            if (is_numeric($sumArgs[$key]) &&
+            if (is_numeric($sumValue) &&
                 Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 // Is it a value within our criteria and only numeric can be added to the result
-                $returnValue += $sumArgs[$key];
+                $returnValue += $sumValue;
             }
         }
 

diff --git a/tests/data/Calculation/MathTrig/SUMIF.php b/tests/data/Calculation/MathTrig/SUMIF.php
@@ -94,4 +94,30 @@
             [1],
         ],
     ],
+    [
+        3,
+        [
+            [1],
+            [0],
+            [1]
+        ],
+        1,
+        [
+            [3],
+            [4] // less elements in sum array
+        ]
+    ],
+    [
+        3,
+        [
+            [1],
+            [0] // less elements in condition array
+        ],
+        1,
+        [
+            [3],
+            [4],
+            [5]
+        ]
+    ]
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,4 +94,30 @@ @@
                 [1],
             ],
         ],
+        [
+,
+            [
+                [1],
+                [0],
+                [1]
+            ],
+,
+            [
+                [3],
+                [4] // less elements in sum array
+            ]
+        ],
+        [
+,
+            [
+                [1],
+                [0] // less elements in condition array
+            ],
+,
+            [
+                [3],
+                [4],
+                [5]
+            ]
+        ]
     ];