alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dead code

This commit is contained in:
Adrien Crivelli 2019-08-12 10:03:41 -07:00
parent 9df68f12e2
commit 34675bdf5d
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/PhpSpreadsheet/Calculation/Calculation.php
View File

@ -3592,7 +3592,6 @@ class Calculation
$valToUpper = strtoupper($val); $valToUpper = strtoupper($val);
// here $matches[1] will contain values like "IF" // here $matches[1] will contain values like "IF"
// and $val "IF(" // and $val "IF("
$injectStoreKey = null;
if ($this->branchPruningEnabled && ($valToUpper == 'IF(')) { // we handle a new if if ($this->branchPruningEnabled && ($valToUpper == 'IF(')) { // we handle a new if
$pendingStoreKey = $this->getUnusedBranchStoreKey(); $pendingStoreKey = $this->getUnusedBranchStoreKey();
$pendingStoreKeysStack[] = $pendingStoreKey; $pendingStoreKeysStack[] = $pendingStoreKey;

16
tests/data/Calculation/Calculation.php
View File

@ -14,8 +14,6 @@ function calculationTestDataGenerator()
$formula1 = '=IF(A1="please +",SUM(A2:C2),7 + IF(B1="please *", 4, 2))'; $formula1 = '=IF(A1="please +",SUM(A2:C2),7 + IF(B1="please *", 4, 2))';
$set2 = [3, $dataArray1, $formula1, 'E5']; $set2 = [3, $dataArray1, $formula1, 'E5'];
$originalDataArray = $dataArray1;
$dataArray1[0][0] = 'not please + something else'; $dataArray1[0][0] = 'not please + something else';
$set3 = [11, $dataArray1, $formula1, 'E5']; $set3 = [11, $dataArray1, $formula1, 'E5'];
@ -39,11 +37,11 @@ function calculationTestDataGenerator()
$dataArray4 = [ $dataArray4 = [
['noflag', 0, 0], ['noflag', 0, 0],
[127000, 0, 0], [127000, 0, 0],
[ 10000, 0.03, 0], [10000, 0.03, 0],
[ 20000, 0.06, 0], [20000, 0.06, 0],
[ 40000, 0.09, 0], [40000, 0.09, 0],
[ 70000, 0.12, 0], [70000, 0.12, 0],
[ 90000, 0.03, 0] [90000, 0.03, 0],
]; ];
$formula2 = '=IF(A1="flag",IF(A2<10, 0) + IF(A3<10000, 0))'; $formula2 = '=IF(A1="flag",IF(A2<10, 0) + IF(A3<10000, 0))';
$set7 = [false, $dataArray4, $formula2, 'E5']; $set7 = [false, $dataArray4, $formula2, 'E5'];
@ -52,12 +50,12 @@ function calculationTestDataGenerator()
[1, 2], [1, 2],
[3, 4], [3, 4],
['=A1+A2', '=SUM(B1:B2)'], ['=A1+A2', '=SUM(B1:B2)'],
[ 'take A', 0] ['take A', 0],
]; ];
$formula3 = '=IF(A4="take A", A3, B3)'; $formula3 = '=IF(A4="take A", A3, B3)';
$set8 = [4, $dataArray5, $formula3, 'E5', ['A3'], ['B3']]; $set8 = [4, $dataArray5, $formula3, 'E5', ['A3'], ['B3']];
return [$set0, $set1, $set2, $set3, $set4, $set5, $set6, $set7, $set8]; return [$set0, $set1, $set2, $set3, $set4, $set5, $set6, $set7, $set8];
}; }
return calculationTestDataGenerator(); return calculationTestDataGenerator();