Merge branch 'master' into brkupxlsr2

Author: oleibman

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## TBD - 3.0.0
+## 2024-09-29 - 3.0.0
 
 ### Dynamic Arrays
 
@@ -20,19 +20,30 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Xlsx Reader default datatype when none is specified in Xml is changed from string to numeric, which is how Excel treats it. There is expected to be little impact because DefaultValueBinder and AdvancedValueBinder correct mis-identification as string, and StringValueBinder usually expects string. [PR #4139](https://github.com/PHPOffice/PhpSpreadsheet/pull/4139)
 - Currency and Accounting Wizards are changed to act like Excel, and a new CurrencyBase Wizard is added for for non-Excel formats. [Issue #4125](https://github.com/PHPOffice/PhpSpreadsheet/issues/4125) [Issue #4124](https://github.com/PHPOffice/PhpSpreadsheet/issues/4124) [PR #4127](https://github.com/PHPOffice/PhpSpreadsheet/pull/4127)
+- Images will not be added to spreadsheet if they cannot be validated as images.
 
 ### Deprecated
 
 - Nothing yet.
 
+### Removed
+
+- The following items were deprecated in release 2 and are now removed.
+- Writer\Xls\Style\ColorMap (no longer needed).
+- Reader\Xml::trySimpleXMLLoadString (should not have been public, no public replacement).
+- Calculation\Calculation::_translateFormulaToLocale (use method name translateFormulaToLocale without leading underscore).
+- Calculation\Calculation::_translateFormulaToEnglish (use method name translateFormulaToEnglish without leading underscore).
+
 ### Moved
 
 - Nothing yet.
 
 ### Fixed
 
+- Several security patches.
 - Xls Reader Some Ranges Not Handled Properly. [Issue #1570](https://github.com/PHPOffice/PhpSpreadsheet/issues/1570) [PR #4140](https://github.com/PHPOffice/PhpSpreadsheet/pull/4140)
 - Better Handling of legacyDrawing Xml. [Issue #4105](https://github.com/PHPOffice/PhpSpreadsheet/issues/4105) [PR #4122](https://github.com/PHPOffice/PhpSpreadsheet/pull/4122)
+- Improve Xlsx Reader Speed. [Issue #3917](https://github.com/PHPOffice/PhpSpreadsheet/issues/3917) [PR #4153](https://github.com/PHPOffice/PhpSpreadsheet/pull/4153)
 
 ## 2024-08-07 - 2.2.2
 

composer.lock

@@ -14,7 +14,7 @@
 }
 ?>
 <form action="45_Quadratic_equation_solver.php" method="POST">
-    Enter the coefficients for the Ax<sup>2</sup> + Bx + C = 0
+    Enter the coefficients for Ax<sup>2</sup> + Bx + C = 0
     <table border="0" cellpadding="0" cellspacing="0">
         <tr>
             <td>
@@ -47,7 +47,9 @@
 <?php
 /**     If the user has submitted the form, then we need to execute a calculation * */
 if (isset($_POST['submit'])) {
-    if ($_POST['A'] == 0) {
+    if (!is_numeric($_POST['A']) || !is_numeric($_POST['B']) || !is_numeric($_POST['C'])) { // validate input
+        $helper->log('Non-numeric input');
+    } elseif ($_POST['A'] == 0) {
         $helper->log('The equation is not quadratic');
     } else {
         // Calculate and Display the results

samples/Basic4/45_Quadratic_equation_solver.php

@@ -3318,16 +3318,6 @@ private static function translateFormula(array $from, array $to, string $formula
 
     private static ?array $functionReplaceToLocale;
 
-    /**
-     * @deprecated 1.30.0 use translateFormulaToLocale() instead
-     *
-     * @codeCoverageIgnore
-     */
-    public function _translateFormulaToLocale(string $formula): string
-    {
-        return $this->translateFormulaToLocale($formula);
-    }
-
     public function translateFormulaToLocale(string $formula): string
     {
         $formula = preg_replace(self::CALCULATION_REGEXP_STRIP_XLFN_XLWS, '', $formula) ?? '';
@@ -3365,16 +3355,6 @@ public function translateFormulaToLocale(string $formula): string
 
     private static ?array $functionReplaceToExcel;
 
-    /**
-     * @deprecated 1.30.0 use translateFormulaToEnglish() instead
-     *
-     * @codeCoverageIgnore
-     */
-    public function _translateFormulaToEnglish(string $formula): string
-    {
-        return $this->translateFormulaToEnglish($formula);
-    }
-
     public function translateFormulaToEnglish(string $formula): string
     {
         if (self::$functionReplaceFromLocale === null) {

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -9,8 +9,6 @@
 
 class Amortization
 {
-    private const ROUNDING_ADJUSTMENT = (PHP_VERSION_ID < 80400) ? 0 : 1e-14;
-
     /**
      * AMORDEGRC.
      *
@@ -82,7 +80,7 @@ public static function AMORDEGRC(
         $amortiseCoeff = self::getAmortizationCoefficient($rate);
 
         $rate *= $amortiseCoeff;
-        $rate += self::ROUNDING_ADJUSTMENT;
+        $rate = (float) (string) $rate; // ugly way to avoid rounding problem
         $fNRate = round($yearFrac * $rate * $cost, 0);
         $cost -= $fNRate;
         $fRest = $cost - $salvage;

src/PhpSpreadsheet/Calculation/Financial/Amortization.php

@@ -88,8 +88,8 @@ private static function vLookupSearch(mixed $lookupValue, array $lookupArray, $c
 
         $rowNumber = null;
         foreach ($lookupArray as $rowKey => $rowData) {
-            $bothNumeric = is_numeric($lookupValue) && is_numeric($rowData[$column]);
-            $bothNotNumeric = !is_numeric($lookupValue) && !is_numeric($rowData[$column]);
+            $bothNumeric = self::numeric($lookupValue) && self::numeric($rowData[$column]);
+            $bothNotNumeric = !self::numeric($lookupValue) && !self::numeric($rowData[$column]);
             $cellDataLower = StringHelper::strToLower((string) $rowData[$column]);
 
             // break if we have passed possible keys
@@ -114,4 +114,9 @@ private static function vLookupSearch(mixed $lookupValue, array $lookupArray, $c
 
         return $rowNumber;
     }
+
+    private static function numeric(mixed $value): bool
+    {
+        return is_int($value) || is_float($value);
+    }
 }

src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php

@@ -318,7 +318,21 @@ public function setValueExplicit(mixed $value, string $dataType = DataType::TYPE
         $this->updateInCollection();
         $cellCoordinate = $this->getCoordinate();
         self::updateIfCellIsTableHeader($this->getParent()?->getParent(), $this, $oldValue, $value);
-        $this->getWorksheet()->applyStylesFromArray($cellCoordinate, ['quotePrefix' => $quotePrefix]);
+        $worksheet = $this->getWorksheet();
+        $spreadsheet = $worksheet->getParent();
+        if (isset($spreadsheet)) {
+            $originalSelected = $worksheet->getSelectedCells();
+            $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
+            $style = $this->getStyle();
+            $oldQuotePrefix = $style->getQuotePrefix();
+            if ($oldQuotePrefix !== $quotePrefix) {
+                $style->setQuotePrefix($quotePrefix);
+            }
+            $worksheet->setSelectedCells($originalSelected);
+            if ($activeSheetIndex >= 0) {
+                $spreadsheet->setActiveSheetIndex($activeSheetIndex);
+            }
+        }
 
         return $this->getParent()?->get($cellCoordinate) ?? $this;
     }