Merge pull request #5055 from HawkForge/fix-branch-pruning-nested-if-condition

Fix branch pruning for IF nested in the condition of a pruned IF

Author: oleibman

CHANGELOG.md

@@ -60,6 +60,7 @@ Some earlier branches remain supported and security fixes are applied to them; i
 - `removeColumn()` no longer throws "Invalid column index 0" when it removes column A and every column up to the highest data column, e.g. `removeColumn('A')` on an empty sheet. [Issue #5049](https://github.com/PHPOffice/PhpSpreadsheet/issues/5049) [PR #5050](https://github.com/PHPOffice/PhpSpreadsheet/pull/5050)
 - `removeColumn()` and `removeRow()` take the removed columns/rows out of data validation ranges: a validation that lies only on them is deleted, and a range that ends on them shrinks, instead of covering the column/row that slides into their place. [Issue #5047](https://github.com/PHPOffice/PhpSpreadsheet/issues/5047) [PR #5048](https://github.com/PHPOffice/PhpSpreadsheet/pull/5048)
 - Minor cleanup in Ods Reader to fix test which was not working in Windows. [PR #5052](https://github.com/PHPOffice/PhpSpreadsheet/pull/5052)
+- Branch pruning no longer throws "internal error" for an IF nested in the condition of another IF inside a pruned branch. [Issue #3755](https://github.com/PHPOffice/PhpSpreadsheet/issues/3755) [Issue #3790](https://github.com/PHPOffice/PhpSpreadsheet/issues/3790) [PR #5055](https://github.com/PHPOffice/PhpSpreadsheet/pull/5055)
 - Xls Writer no longer loses EMF and WMF images (they are written as PNG); the resulting file could not be read back (`Call to a member function getBlipType() on null`). [Issue #274](https://github.com/PHPOffice/PhpSpreadsheet/issues/274)
 - Xls Reader reads EMF and WMF pictures (as PNG `MemoryDrawing`); they were ignored. [Issue #274](https://github.com/PHPOffice/PhpSpreadsheet/issues/274)
 - Xlsx Writer declares WMF and EMF images as `image/x-wmf` and `image/x-emf` instead of `application/octet-stream`, and Ods Writer does the same in its manifest when it stores them as is.

src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php

@@ -80,10 +80,15 @@ private function initialiseCondition(): void
     {
         if (isset($this->pendingStoreKey, $this->conditionMap[$this->pendingStoreKey]) && $this->conditionMap[$this->pendingStoreKey]) {
             $this->currentCondition = $this->pendingStoreKey;
-            $stackDepth = count($this->storeKeysStack);
-            if ($stackDepth > 1) {
-                // nested if
-                $this->previousStoreKey = $this->storeKeysStack[$stackDepth - 2];
+            // nested if: find the closest enclosing IF whose then/else branch we are in,
+            // skipping any enclosing IF where we are only part of its condition
+            for ($index = count($this->storeKeysStack) - 2; $index >= 0; --$index) {
+                $storeKey = $this->storeKeysStack[$index];
+                if (!empty($this->thenMap[$storeKey]) || !empty($this->elseMap[$storeKey])) {
+                    $this->previousStoreKey = $storeKey;
+
+                    break;
+                }
             }
         }
     }

tests/data/Calculation/Calculation.php

@@ -63,8 +63,19 @@ function calculationTestDataGenerator(): array
     ];
     $set9 = ['a', $dataArray6, '=A1', 'A2'];
 
+    // Issues 3755 and 3790 - IF nested in the condition of an IF within a pruned branch
+    $set10 = [3, [], '=IF(FALSE, IF(IF(TRUE,6,2),1,2), 3)', 'E5'];
+    $formula4 = '=IF(FALSE, IF( LEFT( "0", 3 ) = "16-", 1, IF( OR( 1 = IF( "Le L" = "Le L", 6.89, 2 ), AND( 0.735 = 1, "0" <> "" ) ), "", 1 ) ), 3)';
+    $set11 = [3, [], $formula4, 'E5'];
+    $dataArray7 = [
+        [2],
+    ];
+    $formula5 = '=IF(A1=1,IF(AND(IF(1>0,1,IF(0=0,(0*0),0))>0,IF(0>0,0,IF(0=0,(0*0),0))<1),1,ROUND(IF(0>0,0,IF(1=0,(1*1),1)),0)),0)';
+    $set12 = [0, $dataArray7, $formula5, 'E5'];
+
     return [
         $set0, $set1, $set2, $set3, $set4, $set5, $set6, $set7, $set8, $set9,
+        $set10, $set11, $set12,
     ];
 }