Merge branch 'master' into nodtdload

Author: oleibman

.github/workflows/main.yml

@@ -13,6 +13,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
 
         include:
           - php-version: 'nightly'

CHANGELOG.md

@@ -22,10 +22,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Deprecated
 
 - Settings::setLibXmlLoaderOptions() and Settings::getLibXmlLoaderOptions() are no longer needed - no replacement.
+- Worksheet::getHashCode is no longer needed.
 
 ### Fixed
 
-- Nothing yet.
+- Add support for `<s>` tag when converting HTML to RichText. [Issue #4223](https://github.com/PHPOffice/PhpSpreadsheet/issues/4223) [PR #4224](https://github.com/PHPOffice/PhpSpreadsheet/pull/4224)
+- Change hash code for worksheet. [Issue #4192](https://github.com/PHPOffice/PhpSpreadsheet/issues/4192) [PR #4207](https://github.com/PHPOffice/PhpSpreadsheet/pull/4207)
 
 ## 2024-11-10 - 3.4.0
 

composer.lock

@@ -4149,9 +4149,9 @@ private function internalParseFormula(string $formula, ?Cell $cell = null): bool
                     $expectedArgumentCountString = null;
                     if (is_numeric($expectedArgumentCount)) {
                         if ($expectedArgumentCount < 0) {
-                            if ($argumentCount > abs($expectedArgumentCount)) {
+                            if ($argumentCount > abs($expectedArgumentCount + 0)) {
                                 $argumentCountError = true;
-                                $expectedArgumentCountString = 'no more than ' . abs($expectedArgumentCount);
+                                $expectedArgumentCountString = 'no more than ' . abs($expectedArgumentCount + 0);
                             }
                         } else {
                             if ($argumentCount != $expectedArgumentCount) {
@@ -4236,7 +4236,7 @@ private function internalParseFormula(string $formula, ?Cell $cell = null): bool
                 // do we now have a function/variable/number?
                 $expectingOperator = true;
                 $expectingOperand = false;
-                $val = $match[1] ?? '';
+                $val = $match[1] ?? ''; //* @phpstan-ignore-line
                 $length = strlen($val);
 
                 if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $val, $matches)) {

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -221,7 +221,7 @@ private static function validateShiftAmount(mixed $value): int
         $value = self::nullFalseTrueToNumber($value);
 
         if (is_numeric($value)) {
-            if (abs($value) > 53) {
+            if (abs($value + 0) > 53) {
                 throw new Exception(ExcelError::NAN());
             }
 

src/PhpSpreadsheet/Calculation/Engineering/BitWise.php

@@ -239,6 +239,7 @@ private static function xirrBisection(array $values, array $dates, float $x1, fl
         return $rslt;
     }
 
+    /** @param array<int,float|int|numeric-string> $values> */
     private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bool $ordered = true, bool $capAtNegative1 = false): float|string
     {
         $rate = Functions::flattenSingleValue($rate);
@@ -276,7 +277,7 @@ private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bo
                 return $dif;
             }
             if ($rate <= -1.0) {
-                $xnpv += -abs($values[$i]) / (-1 - $rate) ** ($dif / 365);
+                $xnpv += -abs($values[$i] + 0) / (-1 - $rate) ** ($dif / 365);
             } else {
                 $xnpv += $values[$i] / (1 + $rate) ** ($dif / 365);
             }

src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php

@@ -324,7 +324,7 @@ public function setValueExplicit(mixed $value, string $dataType = DataType::TYPE
         self::updateIfCellIsTableHeader($this->getParent()?->getParent(), $this, $oldValue, $value);
         $worksheet = $this->getWorksheet();
         $spreadsheet = $worksheet->getParent();
-        if (isset($spreadsheet)) {
+        if (isset($spreadsheet) && $spreadsheet->getIndex($worksheet, true) >= 0) {
             $originalSelected = $worksheet->getSelectedCells();
             $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
             $style = $this->getStyle();

src/PhpSpreadsheet/Cell/Cell.php

@@ -561,6 +561,7 @@ class Html
         'u' => [self::class, 'startUnderlineTag'],
         'ins' => [self::class, 'startUnderlineTag'],
         'del' => [self::class, 'startStrikethruTag'],
+        's' => [self::class, 'startStrikethruTag'],
         'sup' => [self::class, 'startSuperscriptTag'],
         'sub' => [self::class, 'startSubscriptTag'],
     ];
@@ -575,6 +576,7 @@ class Html
         'u' => [self::class, 'endUnderlineTag'],
         'ins' => [self::class, 'endUnderlineTag'],
         'del' => [self::class, 'endStrikethruTag'],
+        's' => [self::class, 'endStrikethruTag'],
         'sup' => [self::class, 'endSuperscriptTag'],
         'sub' => [self::class, 'endSubscriptTag'],
         'br' => [self::class, 'breakTag'],

src/PhpSpreadsheet/Helper/Html.php

@@ -234,7 +234,7 @@ class Xls extends XlsBase
      * The current MD5 context state.
      * It is never set in the program, so code which uses it is suspect.
      */
-    private string $md5Ctxt; // @phpstan-ignore-line
+    private string $md5Ctxt = '';
 
     protected int $textObjRef;
 

src/PhpSpreadsheet/Reader/Xls.php

@@ -921,7 +921,7 @@ private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet
     {
         $cellAddress = $definedName->getValue();
         $asFormula = ($cellAddress[0] === '=');
-        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashInt() === $worksheet->getHashInt()) {
             /**
              * If we delete the entire range that is referenced by a Named Range, MS Excel sets the value to #REF!
              * PhpSpreadsheet still only does a basic adjustment, so the Named Range will still reference Cells.
@@ -940,7 +940,7 @@ private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet
 
     private function updateNamedFormula(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
     {
-        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashInt() === $worksheet->getHashInt()) {
             /**
              * If we delete the entire range that is referenced by a Named Formula, MS Excel sets the value to #REF!
              * PhpSpreadsheet still only does a basic adjustment, so the Named Formula will still reference Cells.