PHPOffice · oleibman · Mar 13, 2025 · Mar 9, 2025
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/samples/Engineering/BESSELI.php b/samples/Engineering/BESSELI.php
@@ -21,6 +21,6 @@
         $formula = "BESSELI({$x}, {$n})";
         $worksheet->setCellValue('A1', "=$formula");
 
-        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValue());
+        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValueString());
     }
 }
diff --git a/samples/Engineering/BESSELJ.php b/samples/Engineering/BESSELJ.php
@@ -21,6 +21,6 @@
         $formula = "BESSELJ({$x}, {$n})";
         $worksheet->setCellValue('A1', "=$formula");
 
-        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValue());
+        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValueString());
     }
 }
diff --git a/samples/Engineering/BESSELK.php b/samples/Engineering/BESSELK.php
@@ -21,6 +21,6 @@
         $formula = "BESSELK({$x}, {$n})";
         $worksheet->setCellValue('A1', "=$formula");
 
-        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValue());
+        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValueString());
     }
 }
diff --git a/samples/Engineering/BESSELY.php b/samples/Engineering/BESSELY.php
@@ -21,6 +21,6 @@
         $formula = "BESSELY({$x}, {$n})";
         $worksheet->setCellValue('A1', "=$formula");
 
-        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValue());
+        $helper->log("$formula = " . $worksheet->getCell('A1')->getCalculatedValueString());
     }
 }
diff --git a/samples/Engineering/CONVERT.php b/samples/Engineering/CONVERT.php
@@ -40,23 +40,23 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(A$row): Unit of Measure Conversion Formula "
-        . $worksheet->getCell('D' . $row)->getValue()
+        . $worksheet->getCell('D' . $row)->getValueString()
         . ' - '
-        . $worksheet->getCell('A' . $row)->getValue()
+        . $worksheet->getCell('A' . $row)->getValueString()
         . ' '
-        . $worksheet->getCell('B' . $row)->getValue()
+        . $worksheet->getCell('B' . $row)->getValueString()
         . ' is '
-        . $worksheet->getCell('D' . $row)->getCalculatedValue()
+        . $worksheet->getCell('D' . $row)->getCalculatedValueString()
         . ' '
-        . $worksheet->getCell('C' . $row)->getValue()
+        . $worksheet->getCell('C' . $row)->getValueString()
     );
 }
 
 $helper->log('Old method for area conversions, before MS Excel introduced area Units of Measure');
 
 $helper->log(
     "(A$row): Unit of Measure Conversion Formula "
-    . $worksheet->getCell('H1')->getValue()
+    . $worksheet->getCell('H1')->getValueString()
     . ' result is '
-    . $worksheet->getCell('H1')->getCalculatedValue()
+    . $worksheet->getCell('H1')->getCalculatedValueString()
 );
diff --git a/samples/Engineering/Convert-Online.php b/samples/Engineering/Convert-Online.php
@@ -3,6 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ConvertUOM;
 use PhpOffice\PhpSpreadsheet\Helper\Sample;
 use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 require __DIR__ . '/../Header.php';
 
@@ -12,9 +13,14 @@
 
     return;
 }
-
+$post = [];
+foreach (['category', 'quantity', 'fromUnit', 'toUnit'] as $value) {
+    if (isset($_POST[$value])) {
+        $post[$value] = StringHelper::convertToString($_POST[$value]);
+    }
+}
 $categories = ConvertUOM::getConversionCategories();
-$defaultCategory = $_POST['category'] ?? $categories[0];
+$defaultCategory = $post['category'] ?? $categories[0];
 $units = [];
 foreach ($categories as $category) {
     $categoryUnits = ConvertUOM::getConversionCategoryUnitDetails($category)[$category];
@@ -34,23 +40,23 @@
         <div class="col-sm-10">
             <select name="category" class="form-select" onchange="this.form.submit()">
                 <?php foreach ($categories as $category) {
-                    echo "<option value=\"{$category}\" " . ((isset($_POST['category']) && $_POST['category'] === $category) ? 'selected' : '') . ">{$category}</option>", PHP_EOL;
+                    echo "<option value=\"{$category}\" " . ((isset($post['category']) && $post['category'] === $category) ? 'selected' : '') . ">{$category}</option>", PHP_EOL;
                 } ?>
             </select>
         </div>
     </div>
     <div class="mb-3 row">
         <label for="quantity" class="col-sm-2 col-form-label">Quantity</label>
         <div class="col-sm-10">
-            <input name="quantity" type="text" size="8" value="<?php echo (isset($_POST['quantity'])) ? htmlentities($_POST['quantity'], Settings::htmlEntityFlags()) : '1.0'; ?>">
+            <input name="quantity" type="text" size="8" value="<?php echo (isset($post['quantity'])) ? htmlentities($post['quantity'], Settings::htmlEntityFlags()) : '1.0'; ?>">
         </div>
     </div>
     <div class="mb-3 row">
         <label for="fromUnit" class="col-sm-2 col-form-label">From Unit</label>
         <div class="col-sm-10">
             <select name="fromUnit" class="form-select">
                 <?php foreach ($units[$defaultCategory] as $fromUnitCode => $fromUnitName) {
-                    echo "<option value=\"{$fromUnitCode}\" " . ((isset($_POST['fromUnit']) && $_POST['fromUnit'] === $fromUnitCode) ? 'selected' : '') . ">{$fromUnitName}</option>", PHP_EOL;
+                    echo "<option value=\"{$fromUnitCode}\" " . ((isset($post['fromUnit']) && $post['fromUnit'] === $fromUnitCode) ? 'selected' : '') . ">{$fromUnitName}</option>", PHP_EOL;
                 } ?>
             </select>
         </div>
@@ -60,7 +66,7 @@
         <div class="col-sm-10">
             <select name="toUnit" class="form-select">
                 <?php foreach ($units[$defaultCategory] as $toUnitCode => $toUnitName) {
-                    echo "<option value=\"{$toUnitCode}\" " . ((isset($_POST['toUnit']) && $_POST['toUnit'] === $toUnitCode) ? 'selected' : '') . ">{$toUnitName}</option>", PHP_EOL;
+                    echo "<option value=\"{$toUnitCode}\" " . ((isset($post['toUnit']) && $post['toUnit'] === $toUnitCode) ? 'selected' : '') . ">{$toUnitName}</option>", PHP_EOL;
                 } ?>
             </select>
         </div>
@@ -74,17 +80,17 @@
 
 <?php
 /**     If the user has submitted the form, then we need to calculate the value and display the result */
-if (isset($_POST['quantity'], $_POST['fromUnit'], $_POST['toUnit'])) {
-    $quantity = $_POST['quantity'];
-    $fromUnit = $_POST['fromUnit'];
-    $toUnit = $_POST['toUnit'];
+if (isset($post['quantity'], $post['fromUnit'], $post['toUnit'])) {
+    $quantity = $post['quantity'];
+    $fromUnit = $post['fromUnit'];
+    $toUnit = $post['toUnit'];
     if (!is_numeric($quantity)) {
         $helper->log('Quantity is not numeric');
-    } elseif (isset($units[$_POST['category']][$fromUnit], $units[$_POST['category']][$toUnit])) {
+    } elseif (isset($units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
         /** @var float|string */
         $result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
 
-        $helper->log("{$quantity} {$units[$_POST['category']][$fromUnit]} is {$result} {$units[$_POST['category']][$toUnit]}");
+        $helper->log("{$quantity} {$units[$post['category']][$fromUnit]} is {$result} {$units[$post['category']][$toUnit]}");
     } else {
         $helper->log('Please enter quantity and select From Unit and To Unit');
     }

diff --git a/samples/Engineering/DELTA.php b/samples/Engineering/DELTA.php
@@ -37,12 +37,12 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(E$row): Compare values "
-        . $worksheet->getCell('A' . $row)->getValue()
+        . $worksheet->getCell('A' . $row)->getValueString()
         . ' and '
-        . $worksheet->getCell('B' . $row)->getValue()
+        . $worksheet->getCell('B' . $row)->getValueString()
         . ' - Result is '
-        . $worksheet->getCell('C' . $row)->getCalculatedValue()
+        . $worksheet->getCell('C' . $row)->getCalculatedValueString()
         . ' - '
-        . $comparison[$worksheet->getCell('C' . $row)->getCalculatedValue()]
+        . $comparison[$worksheet->getCell('C' . $row)->getCalculatedValueString()]
     );
 }
diff --git a/samples/Engineering/ERF.php b/samples/Engineering/ERF.php
@@ -47,24 +47,24 @@
 for ($row = 1; $row <= $testDataCount1; ++$row) {
     $helper->log(
         "(C$row): "
-        . $worksheet->getCell('C' . $row)->getValue()
+        . $worksheet->getCell('C' . $row)->getValueString()
         . ' The error function integrated between 0 and '
-        . $worksheet->getCell('A' . $row)->getValue()
+        . $worksheet->getCell('A' . $row)->getValueString()
         . ' is '
-        . $worksheet->getCell('C' . $row)->getCalculatedValue()
+        . $worksheet->getCell('C' . $row)->getCalculatedValueString()
     );
 }
 
 $helper->log('ERF() With two arguments');
 for ($row = $testDataCount1 + 1; $row <= $testDataCount2 + $testDataCount1; ++$row) {
     $helper->log(
         "(C$row): "
-        . $worksheet->getCell('C' . $row)->getValue()
+        . $worksheet->getCell('C' . $row)->getValueString()
         . ' The error function integrated between '
-        . $worksheet->getCell('A' . $row)->getValue()
+        . $worksheet->getCell('A' . $row)->getValueString()
         . ' and '
-        . $worksheet->getCell('B' . $row)->getValue()
+        . $worksheet->getCell('B' . $row)->getValueString()
         . ' is '
-        . $worksheet->getCell('C' . $row)->getCalculatedValue()
+        . $worksheet->getCell('C' . $row)->getCalculatedValueString()
     );
 }
diff --git a/samples/Engineering/ERFC.php b/samples/Engineering/ERFC.php
@@ -33,10 +33,10 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(E$row): "
-        . $worksheet->getCell('C' . $row)->getValue()
+        . $worksheet->getCell('C' . $row)->getValueString()
         . ' The complementary error function integrated by '
-        . $worksheet->getCell('A' . $row)->getValue()
+        . $worksheet->getCell('A' . $row)->getValueString()
         . ' and infinity is '
-        . $worksheet->getCell('C' . $row)->getCalculatedValue()
+        . $worksheet->getCell('C' . $row)->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/BIN2DEC.php b/samples/HexEtcConversions/BIN2DEC.php
@@ -39,7 +39,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Binary ' . $worksheet->getCell("A$row")->getValue()
-        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Binary ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/BIN2HEX.php b/samples/HexEtcConversions/BIN2HEX.php
@@ -39,7 +39,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Binary ' . $worksheet->getCell("A$row")->getValue()
-        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Binary ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/BIN2OCT.php b/samples/HexEtcConversions/BIN2OCT.php
@@ -39,7 +39,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Binary ' . $worksheet->getCell("A$row")->getValue()
-        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Binary ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/DEC2BIN.php b/samples/HexEtcConversions/DEC2BIN.php
@@ -40,7 +40,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Decimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Decimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/DEC2HEX.php b/samples/HexEtcConversions/DEC2HEX.php
@@ -41,7 +41,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Decimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Decimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/DEC2OCT.php b/samples/HexEtcConversions/DEC2OCT.php
@@ -41,7 +41,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Decimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Decimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/HEX2BIN.php b/samples/HexEtcConversions/HEX2BIN.php
@@ -39,7 +39,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/HEX2DEC.php b/samples/HexEtcConversions/HEX2DEC.php
@@ -41,7 +41,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/HEX2OCT.php b/samples/HexEtcConversions/HEX2OCT.php
@@ -39,7 +39,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Hexadecimal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is octal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/OCT2BIN.php b/samples/HexEtcConversions/OCT2BIN.php
@@ -40,7 +40,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Octal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Octal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is binary ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/OCT2DEC.php b/samples/HexEtcConversions/OCT2DEC.php
@@ -42,7 +42,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Octal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Octal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is decimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/HexEtcConversions/OCT2HEX.php b/samples/HexEtcConversions/OCT2HEX.php
@@ -42,7 +42,7 @@
 for ($row = 1; $row <= $testDataCount; ++$row) {
     $helper->log(
         "(B$row): "
-        . 'Octal ' . $worksheet->getCell("A$row")->getValue()
-        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValue()
+        . 'Octal ' . $worksheet->getCell("A$row")->getValueString()
+        . ' is hexadecimal ' . $worksheet->getCell("B$row")->getCalculatedValueString()
     );
 }
diff --git a/samples/LookupRef/ADDRESS.php b/samples/LookupRef/ADDRESS.php
@@ -18,5 +18,5 @@
 
 for ($row = 1; $row <= 5; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/COLUMN.php b/samples/LookupRef/COLUMN.php
@@ -21,8 +21,8 @@
 
 for ($row = 1; $row <= 2; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
 
 $cell = $worksheet->getCell('F1');
-$helper->log('F1: ' . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+$helper->log('F1: ' . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
diff --git a/samples/LookupRef/COLUMNS.php b/samples/LookupRef/COLUMNS.php
@@ -17,5 +17,5 @@
 
 for ($row = 1; $row <= 4; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/INDEX.php b/samples/LookupRef/INDEX.php
@@ -35,5 +35,5 @@
 
 for ($row = 11; $row <= 16; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/INDIRECT.php b/samples/LookupRef/INDIRECT.php
@@ -29,5 +29,5 @@
 
 for ($row = 1; $row <= 5; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/OFFSET.php b/samples/LookupRef/OFFSET.php
@@ -29,5 +29,5 @@
 
 for ($row = 1; $row <= 4; ++$row) {
     $cell = $worksheet->getCell("H{$row}");
-    $helper->log("H{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("H{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/ROW.php b/samples/LookupRef/ROW.php
@@ -16,5 +16,5 @@
 
 for ($row = 1; $row <= 3; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/ROWS.php b/samples/LookupRef/ROWS.php
@@ -16,5 +16,5 @@
 
 for ($row = 1; $row <= 3; ++$row) {
     $cell = $worksheet->getCell("A{$row}");
-    $helper->log("A{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+    $helper->log("A{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
 }
diff --git a/samples/LookupRef/VLOOKUP.php b/samples/LookupRef/VLOOKUP.php
@@ -43,6 +43,6 @@
 for ($column = 'H'; $column !== 'K'; ++$column) {
     for ($row = 4; $row <= 5; ++$row) {
         $cell = $worksheet->getCell("{$column}{$row}");
-        $helper->log("{$column}{$row}: " . $cell->getValue() . ' => ' . $cell->getCalculatedValue());
+        $helper->log("{$column}{$row}: " . $cell->getValueString() . ' => ' . $cell->getCalculatedValueString());
     }
 }