From 9fc8e501b84fe1da2f643d166dfa2d853f3fba6f Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:28:36 -0800
Subject: [PATCH 01/30] Extremely Limited Support for GROUPBY Function

This is a partial response to issue #4282. The actual logic to implement GROUPBY is probably very complicated. And, even worse, Excel has thrown a whole new way of (internally) specifying one of the arguments into the mix. That argument is a function name, expressed not as a mapped integer (as SUBTOTAL does), nor even as a string, but as the unquoted function name prefixed by `_xleta.`. And, unlike its `_xlfn.` and `_xlws.` predecessors, it is difficult to figure out when the new prefix needs to be added, and when it needs to be ignored. I am not even going to attempt that task with this ticket.

So, what does this change do? Like earlier attempts to introduce limited functionality (such as with form controls), it is there so that using GROUPBY can be passed through - you can load a spreadsheet that contains it, and save it to a new spreadsheet, and the function and its results are preserved. Some cautionary notes. Dynamic arrays must be enabled (the function makes no sense without doing that). Changing any of the inputs used in the function may result in internal inconsistencies between PhpSpreadsheet and Excel; this is especially so if the dimensions of the returned array change as a result of changes to the input data. The programmer can avoid some of these problems by changing the formulatAttributes of the cell where the function is used; this may be difficult to do in practice. Oh, yes, using the GROUPBY cell as an argument in another formula will probably lead to problems. Finally, I confess that part of this solution looks awfully kludgey to me.

With its limitations and those cautions, is it worth proceeding with this change? My gut feel is that it is more useful to proceed than not. However, I will give others the opportunity to weigh in. I will wait at least a couple of weeks into the new year before proceeding with this.
---
 docs/references/function-list-by-category.md  |   1 +
 docs/references/function-list-by-name.md      |   1 +
 .../Calculation/Calculation.php               |  11 +++++-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |   6 +++-
 .../Writer/Xlsx/FunctionPrefix.php            |   1 +
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  |   6 +++-
 .../Reader/Xlsx/GroupByLimitedTest.php        |  34 ++++++++++++++++++
 tests/data/Reader/XLSX/excel-groupby-one.xlsx | Bin 0 -> 13632 bytes
 8 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
 create mode 100644 tests/data/Reader/XLSX/excel-groupby-one.xlsx

diff --git a/docs/references/function-list-by-category.md b/docs/references/function-list-by-category.md
index 458a59b39c..fdd23ae624 100644
--- a/docs/references/function-list-by-category.md
+++ b/docs/references/function-list-by-category.md
@@ -245,6 +245,7 @@ COLUMNS                  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\RowCo
 FILTER                   | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Filter::filter
 FORMULATEXT              | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Formula::text
 GETPIVOTDATA             | **Not yet Implemented**
+GROUPBY                  | **Not yet Implemented**
 HLOOKUP                  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\HLookup::lookup
 HYPERLINK                | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Hyperlink::set
 INDEX                    | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Matrix::index
diff --git a/docs/references/function-list-by-name.md b/docs/references/function-list-by-name.md
index addc2e3e97..a403beffe8 100644
--- a/docs/references/function-list-by-name.md
+++ b/docs/references/function-list-by-name.md
@@ -239,6 +239,7 @@ GCD                      | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpread
 GEOMEAN                  | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages\Mean::geometric
 GESTEP                   | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering\Compare::GESTEP
 GETPIVOTDATA             | CATEGORY_LOOKUP_AND_REFERENCE  | **Not yet Implemented**
+GROUPBY                  | CATEGORY_LOOKUP_AND_REFERENCE  | **Not yet Implemented**
 GROWTH                   | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical\Trends::GROWTH
 
 ## H
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index ab52fb1af9..704332b59e 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -1256,6 +1256,11 @@ public static function getExcelConstants(string $key): bool|null
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2+',
         ],
+        'GROUPBY' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-7',
+        ],
         'GROWTH' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical\Trends::class, 'GROWTH'],
@@ -4601,7 +4606,7 @@ private static function dataTestReference(array &$operandData): mixed
     private static int $matchIndex10 = 10;
 
     /**
-     * @return array<int, mixed>|false
+     * @return array<int, mixed>|false|string
      */
     private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell $cell = null)
     {
@@ -5182,6 +5187,9 @@ private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell
                 } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token, $matches)) {
                     // if the token is a named range or formula, evaluate it and push the result onto the stack
                     $definedName = $matches[6];
+                    if (str_starts_with($definedName, '_xleta')) {
+                        return Functions::NOT_YET_IMPLEMENTED;
+                    }
                     if ($cell === null || $pCellWorksheet === null) {
                         return $this->raiseFormulaError("undefined name '$token'");
                     }
@@ -5214,6 +5222,7 @@ private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell
                     }
 
                     $result = $this->evaluateDefinedName($cell, $namedRange, $pCellWorksheet, $stack, $specifiedWorksheet !== '');
+
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $result;
                     }
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 546a6ffe5b..5943e5a993 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -49,6 +49,8 @@ class Worksheet
     public const MERGE_CELL_CONTENT_HIDE = 'hide';
     public const MERGE_CELL_CONTENT_MERGE = 'merge';
 
+    public const FUNCTION_LIKE_GROUPBY = '/\\b(groupby|_xleta)\\b/i'; // weird new syntax
+
     protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
 
     /**
@@ -3701,7 +3703,9 @@ public function calculateArrays(bool $preCalculateFormulas = true): void
             $keys = $this->cellCollection->getCoordinates();
             foreach ($keys as $key) {
                 if ($this->getCell($key)->getDataType() === DataType::TYPE_FORMULA) {
-                    $this->getCell($key)->getCalculatedValue();
+                    if (preg_match(self::FUNCTION_LIKE_GROUPBY, $this->getCell($key)->getValue()) !== 1) {
+                        $this->getCell($key)->getCalculatedValue();
+                    }
                 }
             }
         }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
index a563bd9130..16834dc04d 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
@@ -142,6 +142,7 @@ class FunctionPrefix
         . '|drop'
         . '|expand'
         . '|filter'
+        . '|groupby'
         . '|hstack'
         . '|isomitted'
         . '|lambda'
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 28af258297..929b4f8c09 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -1578,7 +1578,11 @@ private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksh
         $mappedType = $pCell->getDataType();
         if ($mappedType === DataType::TYPE_FORMULA) {
             if ($this->useDynamicArrays) {
-                $tempCalc = $pCell->getCalculatedValue();
+                if (preg_match(PhpspreadsheetWorksheet::FUNCTION_LIKE_GROUPBY, $cellValue) === 1) {
+                    $tempCalc = [];
+                } else {
+                    $tempCalc = $pCell->getCalculatedValue();
+                }
                 if (is_array($tempCalc)) {
                     $objWriter->writeAttribute('cm', '1');
                 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
new file mode 100644
index 0000000000..a7edf6b7ed
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class GroupByLimitedTest extends AbstractFunctional
+{
+    private static string $testbook = 'tests/data/Reader/XLSX/excel-groupby-one.xlsx';
+
+    public function testRowBreaks(): void
+    {
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load(self::$testbook);
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
+        $spreadsheet->disconnectWorksheets();
+        $reloadedSheet = $reloadedSpreadsheet->getActiveSheet();
+        self::assertSame(['t' => 'array', 'ref' => 'E3:F7'], $reloadedSheet->getCell('E3')->getFormulaAttributes());
+        $group = $reloadedSheet->rangeToArray('E3:F8');
+        $expected = [
+            ['Design', '$505,000 '],
+            ['Development', '$346,000 '],
+            ['Marketing', '$491,000 '],
+            ['Research', '$573,000 '],
+            ['Total', '$1,915,000 '],
+            [null, null],
+        ];
+        self::assertSame($expected, $reloadedSheet->rangeToArray('E3:F8'));
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/data/Reader/XLSX/excel-groupby-one.xlsx b/tests/data/Reader/XLSX/excel-groupby-one.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..dbb92b6057e6630bd54243a2e91a16fc033291c0
GIT binary patch
literal 13632
zcmeHug<D+7@-{(&yIYXp65L&bySux)1%kU15}e?{-C-bjaCZp|?hXNlk7V!tvdixN
z1;2adnRA|bx~t}#?)R;#?y9384FQP(_7V&R3=E6}%q{daY{UyNFzA<HVCY~l;MyYg
zb}puNF8V5-4yMk!Z#-;mh;typsj|VqpZfpr_&+=XwJL*h`-~{duTPQV8;Tqa{maW!
ztJkVFNID<hcV@Dy5iXt~jDh&jm5XUr@KlpzbGkFnabib-M)S9Om@G{=c&=Kps==M2
z`(IlXA2aR5{ZzydIs;-~;MWN&VNY)44ouRJs45W_DbhRtC}B&%;>qTwK&WPpY=TH0
z<(-8c0^cec?cH#;H8McpU4JDaOR3Hoh&?)espRWN<>@A*`jP0)t5{q}Y6aH-wOBv!
zL6|wBCWXZ!*K-%LxgZIZt}blpmfMsv>J~Mn2Zy@t150k<gT!pP)fc+2MXup;-9I=G
z9==_d&$wPY5zK3rz9K#+bXnJBX!DKqJSEu3SwXC}x0Z_BL(;jKY6}F|Q0VFvLSs$b
z(RM&^YnUOpdV+L>{c(xO^gQ!K8rt3?F*U@E^H<9p->-p#`d*EVlLSJAtm3pSvR%E0
zgjmt3XU>P7sq9?tVfb<uXG{uP9(4zQBNN{4l>`aH!m|YIuD`1{Oq#l@GCnY#&RPCi
zCLJZe`b5;nM+h*5zfibNmGSk(6E0<*7z+PHVSOi48)t?$KhOW8?*C!F{^`+66J+JP
z7!g8_CGJD}ucw#eP=ux3g(O-?RD9n{E+N-N=aS(s11JelRPX{J-ukuq-hW$M=8fL#
zC%IZ@EsaFO;CWr|UKaB4hodVr4TV#(xMS(}ZdAAF%jv6>w^E)|Zf&tNC5=U&r3Y4D
zi%*`4R-uf(QOAQt&nF1M;!E+@>Xp@8F}f*#F)gfoSQb**z>&R|IGW}+n_RGqC=kXa
zb1;#D+3##*K40$BZ$ol<i>In=!DU%#l<CAx>ZxyH({V1E20(xCp_fbVS0ZIayI~%E
z+ee;#>8Dl8dODcl+06mlRnmVl5D-aJwDON6*#xr5SVMq;RX@2s<foDGuwihwcd|CJ
zx3~W3<4RR+?Q=O%K)w?o=x+B2Sr6DE7tEE~4-2XvhU*$8q-e2aD&aWIWfF@Q9(|2r
zEL*tBoR%Zec&-p)vr;^H)BTp%>aHZj`aJOWZV-0yY@PKg-3a&m%9)MJtux4Mg{)R4
z6#Q~BK&R_nMBCbLULA4yje%t!3b!RVp?@;_s9sC5jJrC9MMsW}7+;BDU9$)y6;Ym}
z!d_=d0!&3TEaNAIT*pArOQtJ?9lZ;wcY;K%r9j(p$6Rzl*GkL+pG7$xvyV#Wz<=Lp
z&Xy<-QB=<6>Cj}?M10K_)YcVKkAC9%JrosT#s%$DOpKMr8;?F|&zECc5<jSXqhz91
z^9<b611IBbl*ir{Sa}$bFS%DcA!{7L<A?*ILxi*f)xafIc*fHqIHUob44Sg`Z+ERs
zYHnrlRKIA=T1^bp8YEzSKI%-c-%Udtx6jF(HmKW5-rU{l5gOqTrnQj#p;a!}kIu_U
zY8?`H25CrVB`GFN7VSwZ6nfX_tL_ZprsJs4SfA&2Eu+w=k<Ac>DV_igY;Pf{p72r(
z^&;@mX1P85fHY9G^B9OGS^kxUq&>dt=5brYKLUoLZdu}U=i?v{ju{lpD-8Pltq0_#
zCmgW7n)SeXZZmrx)m?4e<z`lnN*`w|>S0D-$|<gB^!T1C2p^b!QN1v$Vi?kl2*t~+
zo49P!NwuSS>I7n0@IzpGWR<BWqEVV|v%_6>W0+Q#wsr4Y2(TAf?vSdHxBs}<>Cp$L
zDFnE%h1cnAlTRw6HHeB=im*bB&@2-0<`1FDn3Ev<@ZKdEH$JQBrQEyGv-SS!?bD8a
zA2G|FL_yn6b#7yBqTI>W#f4XF{_Uk&U!<64*iegdyG{K=N#*3X^G1XwtndilMbYVd
zj%Bp&0T}~RaVopnwLJP85R*m-x-##QnHtQKQ5VBMaO<V!#piy@TX=Wk$J!<|)p_ws
zk&c!WC>3}AVufE?OSqA^h>3XZF4YD&^qLhS!YzcQtCycSr@s!7a=<JmG?CM_8oQe2
z{w#yu+zv@znbf;6W{(1CUod*!_qtLu2LH~ft;xHSS<!P<;DNS}0p*>nyvvB4yi1gT
zenq+bMVplR>T$Jl2KKCCHRrNlmCl>?@(Dn}>mfhcA}$P_=s=laNeb-8C)WMlc||#n
zRboFew(p6XcwjIuo_P6(|N1jK|Le<MJcXf8egAJCrHP|b-Ha%`#{tJEP7Rjox}xmM
zfuskWku%UZ36{$BvQo^T-9`KoyOv59hBnA8{Ihoegv8;i65BcG9|}CQp2>OXpH<~%
z>l5zFJer#~=uk8eqid)<WBu*V2P22!*#%FP7+tY7T&jeeM5dPEQIk5cgx9%itCYD{
z!Fwjub0F$M;d*FfXTQqxdH4bc+_ankle6iV@30d`y<4hFG5NVKS90>vQArh6yP+$=
zeS*nu?K4Eh-^le<Bu5o;Vi8P+Dj}G&_r=i<ob2B7<A~yMAt|AVm}8l>kwpcF^WhX7
z!Z^omQ8=~iDBa6!;KH(^L=himG50yv&_R1lRRA|u(~gQ#`X3qBckVV<{}EOV3m;3%
z;K0C!dBDJMo_hSp+&f#Cnz}eM{JJpxwEO9ai!o`8C?UtRmxOW0oogs)3jGnb?0YLJ
zs<E>%xB-|^Uk=k%E|+=Yy2_J^Bh<icctHTam&i4tfmW@AIJB;5iBvG*&}C!!HnUu}
zAlqH}aC1U?>6INUCnrehS6j!c!&eJ7Hi&DyWVP&+b<VotUohFI>>!qfBIBj-dkEW8
z+3GT0=pm6#D`17ds_N7OMf->N5Oh_QI)o$30%kIZU*a7x`e_f2=vhcD1u8Gu)Mqf%
z?x9pAM7#98km4n;-gYfP)MwMUCW&Y|L3+s$a=l~3Qo71XO&wL=?DQgGmwJ2gOgUBQ
zO?lqpkK?bROl*~j4=>uY=N6SBdeyPK{i9c4q{}No&M7vugX#BXv2?PUICt_r)hEWi
zuO3{Q3_va_GQERh@p)nwp+n~R-RMUpX9y}>)Hw&r1Zdn@h=>;=Usu{wy<;lcg(1Ga
zNEPkgzjMyNELgpXk|rTNto;1e={pdKUvLr#gsrIoyhKmWdC|t*nyJ5(Eb`WmT@My>
zmHjAk#SgNnoN%GH6NmOto18Wlz7pIUqbzW|aT{)#7&0p};bAm{uNRpsoJmu&nVXUh
zj)D%C5`o&tIzvrB-hYQq0G5dx#*r63cfb#7K=b{E7$c%aLd@H7K-o^*p8hY0{5mBq
z>e?^$;)Z+&<Qz#VWmk%pn`j2mW#0*nxJT4-?I>0%sMjlM!;$q!g5F6C)46Z8S-u>S
z44}2|y<%A+$;x*+zjp-q%^&EwHE_ts0y22p^i?7gxAonSN0$Y3)wd%PV;PRI2hTaM
zBNJQnv-Dp9iXIA)+gzOi>f0?X`;QM*^8%}fMBF^yHLV&;D@&LA_ci)O`1_!lhqUb&
zz{(p2dpW?$O8QEE$~2>MstMw}V13-n2?|XDEH$)R$k&}x4rr}Gah;afJ8@R@N*OWb
zSw}fMgSp<cIgu>txBX&V)iJM+&*IOWOcH(bNeaq>#D!^vB*)OAAZa@#Ptb&4id7G4
z4qQzhW80rgB$Li@Cg|7K^|Q%csQ;K<Y%pKeC!Oko3$?b_rn^0xdY9CGL6p6ib_c4d
z^7dMIsN(coSOw_Ye4HKLT)*006<8H$we-9HUg%c_x_fXhSw1gpNxbVTWB~ZCyt{5t
zeb=Tn^T-+BUS2WV=KgpIGQHkf6}SbgrmtKB29MBx>~@LVF50Xg7vD`c`$yKm-*ai*
zZY%uhIfbewmkm|YWhS#e`)VE3&h@Dh47h6@0J-J5Gkj<5>*jX5;JW0nrQLW4yB?b#
z?{5Y_9))4>pcHN((Tz6w($1>?MH$4htU)i*#iS85&8cSO>szE&^sG8gRQENf0Yc7F
z#sk4BlZ6)m?;nq#&B-q4c)#@M+bn(6d&vIj50Lbo5|wD_kPIXy3c%G2ZI-j+LNU<#
z58a;lFY<!v66VVipis<^`$%$Skib#abxUDOEGdXH6)8J@*miSWDj?Z_OaoRf;3En%
z)jA*@(@#LRS6@GTP#{KT*=k*s`~Ax4nLsIHw?19U`s3)v;89IK|47e4Nr@Hk;-fSz
ztX4q00XZkEo^XFQ48S`o#qscZlGMksx^%r?<;IaT1W<|#G7Kj1fsGDQ3rNT&$AMJ~
zNL(WiLWodk>FdM&d^Jg`aw|ymwg4%K6IG-Q5B9S1D@yU-(NXl^d>5sn-zQdjW+*T$
zqg!f8_LAp}t_pVsCn1<M4l9Qk&xjano%j`+6E(|Gq?(@cV@_nRUb4XTYz}?dkAj7U
z@>2Z%(0EofmhusCyU;GuzBtpjHjI<P7@{Hw-NFRjBEoM>`_HwkF=@3>t9Q~$SXo>J
z^WyD^TDtK1qQ<qD{@Szm{D*Z9xb`4;ni&Pl2<^dizjIGzFO%{7B;HUh3e-3XL=_73
zX<VFi%4zG?oZmkAv2!(dLCOFG7enl{1YiXrl0YO`wX{<PUJ(V62?gE}1sS#}iDZ;E
z6m!v#e$g;>Km==hfIGUoYu)HTSX_uejW2ISP%A9JBFtYSEYL%uKYysvo`U7btEwLZ
zy4vQw>iDc4phB?Mk!<;L<d%T9)Uh?jw9x9=1NNS4>Gh<l52SuHqo~+u-O-KF?X&Re
zD(>6Y7^(gA=Uc%YrFF(!)FEHgNlo$b8oXOttP178Xf~WS?k#e8)^pztb5J+9fz5CE
zXoC66O0*A0=F8#@d}s*>OA@#ol9xs#Nb4jdA4xa7^d`Lt8PfEEXSp8|OyT3V9knRl
zQF1t`<@wVYKkLoB;VD~THd$gaDb1p6E`}#bZUW5YC}mnYCq~Q*rV0ze2@B>73k}lw
z7PXDpmMT_}AjU8(!$({gf1$&4raJa>Hrg|RcarVdKzyn893YQWdmd0*s=eTT#`~L>
z-ncg*ws|m}m!;WW6KQl_R7q9bX}yz%TjQ?KUxv9gZkw$wRkk8Q_DOx+E^C6G(ka`7
znZ||(N$!qe!N1;#UcY0C%EcQ^;SjbM+`+wBgMaV(s^4?Gr4?^LW2X7Aa__V>j)mUr
z&#>%0kI);=q4d_nOYteE@>-FA#+~8R>#d$<`}CIqW?uK?t1uf)#3YNB(d+RX#`mmh
zdg>`oC#@Tp@)wG{&Qw3Qn&D+dspn;l<4nNoml%`=$gBtg_iJ9V(2EMOb_>#V3-OWx
zl|)<9XV3Kd1}Ql-1t<Ea9^ORf&3e9uGSM(@j39Y75n<aOTFIqf`9?6r$Pi*!ez3pZ
zVU5%6d2$qgVOjS%_X_jXrz0lUn_b=8sbukH5Mxw-R+jW@*Lyur-~cBg5H)xG+0ce<
ztG4Fb=+XA$Rr}jK|Kskh%es6U*?()St2o*|-IxszZRv)q4zVHDeh#%NPhBhOyTN~J
z9JZi_|MqW<V&>F$z5mwOW=g%^^^c9DRp*{;K-X5kc-Hj$I5rcAd0{+>KO2MYZn@Y;
z?ZvF$L4s(EBHUL-6w!+6gBPV@qEwQCke$c?UZL7W);Y5-x5!xz)ndQ%kogRz*OJ-j
zh+UA#nTcAZ<0)D2!Wlir%jwpo>0dyO=GDk9muN<*2HEB5b{x=<;h**EoIs7<K|CdA
zjY{(E<eC<tV@&&S`6jpCuQOOGMWy!GoT@)*s`yMzjCIfC=qwx;U=KR)g-^Bp<BrCa
zL9I|DG#D5v>Cc_}Um>oGg{iG6!>{wN==MNsI2OMF69C=+C^)1$GqmGv$Te2TadqVN
z{ev!0LNX~tZ^S`Rsf8Bf1>E+Ov_H7zxU~O@7gfYdi}x>^fU!&luVo*@c%8&kzehy0
zfdmtb+!<J=j`=`aZGC+lvCh|tC7(XSlag&p&cYwvydoWl8nvuG@RFz4kXjT``fd_~
zD=#stjlTQN>3AddXdMDG{u6PWJn+SlSG>}$P#ujqW7H;LW&)(Iwgaj$RD+Rb2D}ff
zm$4e+JAh_1lPqu28qO5I7Tr!%cDUN^@*))xQ=@Fs6a)*!NUfETB+kJ-?-)!|G6cmK
zl$kE_R?7JxY?IO}BMq9H&-=Gqqa`aX+C9)sD9YX@(oV+b9|t$V&(Ft(sFNoT^FUNK
zvw>y45C&G*99H{}W&98wHMqQ%z4@gq7OW3$pNyrm4<<ghOu|{Qx90)sySR2(?+lkG
z>;+RmKaN;pcybN9zTzu{*dMHU`_3It(Y3xXz1c!)=ijUQ8XwG&9X1a1!CtnhTO1~6
z3#Q}barw$KT(F9_bpj4GUK#y{uP1=gO24${1{d2H%!0Tpf<mH9xw?ZTY+bLoQB;IR
zIb`;gl;c-&ggZkN!JX*`hdX<^7-X0?lGb`1qDKgp{1PLOvZ}M*U|MZxz)g<TRu9l+
z<o2WIX%99-<|91exM?1<YVs0^T(W5s5eU@x_;BgI19${2BI|<&qCcA6m-vA|(+#T+
zNnRRO!PI)7+Y)tszsoZQzZ(#dK6mXkWM=YrbUgHMxqfo5A!83gW4JVdl!!D*8B!T~
zSOR~$(7pHwy0rm37VL6)8+3lmI8&XDyApG(*&2yb4A-H1#t8Z~rtQ+v;7Ks#OC54}
zd9{HFz9x+ij<HPb4#RvM;hSsYG{F~Ax-`(JRTi1d=~S&`u!<6oy`!*>yvycET5fy=
zES==~R2R5n?_@G4QpUbuN(7IQM0YY+V+%RdnWk+N7LBIte+dPC75`e@F(l+G{K>TU
z&LiL9K#8l9i5CAJrleo&%!b~~bV-8d<RXDFM%<Y+UwSM4{Wd+<14&5tmdhQJb|1SE
zmDkaPXAl>|>(F~2l<%CbP6d)Gy}mS~B%(~*o8O=WwyxmDuh*c{4_vR6rRdxN{HVPC
zkm?00kYONGa)S0&`Np<avo`+Ww1XF-Hm0+g*&{nU70GHAM5td+$TQIcGJW<8#<sth
zo(Eh6!c>1FafF(Iu<0vqmk$eKmYij4p*{<fqBR-qPdNVW+}fV(F~b>NHCK2G*=iSj
zq|#yJqTtbOwr#ow8+?Ym-eZ~c7R@Coz`Is{-!iDIO?p+@y|p}e6TqQqT=^zz*+n-1
zp{WXi?24m)7?Q<0fYgBEQ_gGkW+>Fbhv2Xk_2{{8)D4x`w%=b;MU{F{77Xl1WTDeR
z0`5JnvXIp-8!-XWZ8Z!P1bQV-SKobu>xNM(5|qIg2kh3H>22+#@sA(dYv&u1?cq}w
z1Geh39oqul#RU`;8D_UqYw;DFq8}gL(NP(jTMhTevz8ITR<NBjA*5y|S<2Ymy|;w?
z_`}lx9KHc#uAjJb+P)}agfv~)kBU)uD1S(mfn2I7s6HN-{XxY^w!xCWY~7fDbRnYv
z05qpa(!kvCg}{@a=d3MO39+j`6B>TnhpW_0Rof4FpWFr;K4HQho*F1>&2oc>*6e)c
ztKmXGx1jaVtIAUVW~E)x;mr}ya9KWEWFD3M8k+5g&K<S$WpB#@*YWh^UDUugRIsuh
zU3qub*|ylitT*s=94ED6UpdL)Y14vEKTw~TK-zbCx+LEn31B*KT)GxId=ZmRGpfOZ
z!z;TAJ*kr;oppkc{+1FzzJoU70TVeQ!jkUR26Ykromq~=BhUBxs|{=@0}FXI<|F$T
za!e(}swn2jw9>>|%7O@(Zi}VMi*x%fe{za&6Cih`i{BTZaNC-%C9q?^{^Nj=kXiA;
z^+Z^`iyJ&Ozcki}e)P>^U>%vhf6HjjEqQA72ahO{ZoD!<Z+AIz0wTzil5LEUuKJYH
zFn~3Wa^^#sNI5Byak4n)s?xW4-oP|OQ|Z1XTU&+Z!7N;aX6vuJO2?JQt%vQt6*I}S
zSAB9-mRgo#_Gw2pKfb%&qLmn7*J+qG-Fb~1+9VJ{7CWbTT(<#4%RUX|6yP3j8D`X;
zE2b@Ym%>Q3$UDa_*QW(dqS?1x1}<F|P4jdYRI>WpBaIB2FZ%pINa#b6Lsh5aIW&V^
zN||8h!|ZKP=GWi;C}S2*ao+SsszwF$i4G-0-?eQ_m1`@s&y%eKO)xDLTWwBlO!II)
zz^i6ZtOlwDbL88c^<^=A>xVgl8oOXw>v1t{U0b;+*D^b^8Kl9?g*-!J>c)jS(%J#2
zkO?lHp<yQmU<&OA^#zAuwE(xa)gRG%?@-uZVgi<NRQKwd^({HP>ZB^hi=cAF*O2eN
zZwtzcIga(W``~n0qG&&@Z$F)8*b}c0`_E?J#+EGkY$&j;aI6YKeh1kTcf<?Q5<p#6
zVk6N68jh7tbs5%7*iCzV5Sk+h;hU>X+gRCt)y%k-EkF>{7hO3)09Jl<jrTzhz+S|<
znCr`lB!2lBdCljpDWCx-!`WH8BmcYW@!MZ9$n*T3Vq_^^2_zU8!IPIq{KL^ZyLj4|
zI{)0j8q(0VUu4JdC8~TRrs|4AQg*2V&XsS{xfx{(Vq-|WJRlJilunXOLeq_q+eErM
z<{`@u8!3xP#5)fZdzG*~5*td8slruf$HV|jYqThEW&@86D=o<sdk82mkQ=R+@{hn!
zR9l<V+nC_TeYl@|%1uNtVB^5UYhak#Fa&8J=`_e-alYL|)m{e|XYO?-%O2deYXair
z=j$XXbDXr6r@dC1OYI_-uQyD14f3pWK}%+cCuR{2*Pzv_|3Ddtd>-J)nwxF48A??}
z0~mxTS&v2$dq+%332RP1*o}JPs+k-QDWKADe5IRIoBsaXF8#j$G5~Rrw*7VC*yc@g
z|H*u=Vb!<7CaSWaGC0)5PQrnS*F+O@F*eeDCSR3KCMxvRWLh7^{E&PFI8W?W+5r4M
z679a`EzyvHx^weDcjue5{5b;8gv0|qBK9C_*|8zQ2QDtfNl>HW{qjQ4IHR$cH7r#b
zILD1nWkrt)l2Cnsr_+puhHs4>DpUl6s|=3m5?Wk{K~@e1Ri9Vyu2SVhvtW8ng_B)~
zlklt;T^!_x_Df*8AhTpnNzZ*nuq+BWi`*+VE0M>PS|{t!!(R4#J%W0JlB72zqCpca
zNk{#kAPiZ9mKhis3dXATuBN?UQ5nFBT*jtakB2gyYp((=?x4tX$v$WeQJQ6TvZILF
zaUU1WhGxyee|JB4+vls!oHacu8NUwK#eYCU)D(itJeu@v?<s|jBmW{b?QjYDODZd#
zQabF~w*em#KmdI{0tIBpti>lZR&%HvX4f>#*fK~9XpC6fDlm-p21kUzfXY?m7Da)b
z098;`;Z;(JiG74Gra;-l)wfj^Z-#1pa?##{)40QFdwaqQ`m;mmCfmmp5RHgI;!)*W
z*VJRhlf{?&(6oA8`0q^vsN0epuH5St!BkTe%LF}XksURm2Pm>_m#21$c-Bs%#hSav
zOYSMvH7%O*tTj`qR+^!~7gjVnJr@P?P4s|sIw#>Q{^*}09OW}43p5uby7=|gJQz5}
zimUtR*_P0GZ7pgRYBdO9@l%Vqm3a=S_10vD;qkudW0&}Z+^Xo}n(Wq73ti(e@Fz6}
zUu6$$EC62Eb27Sbv;`M_ZS$5=TXIcqrGwMffbjQ{Tsl5}`+DT;Owry5#<nHAWz?D>
zvX>oD|E;KyjPO_%ZK*pevLA_ENR97>|ELtRgS1}f+RA6cAuUF^_7`B^N;JS5L%z=-
z+QSEsy%d|tQ+?@&HV-z409@%f<XNi$9@5uS(v8N)bJk#fR&bOi-Y;4d4}845hYu&6
zI!UQodsQ2NWI3IQXQk5r7Sc6y$r8%*<2piFQDZZH)M5PtrQ85bC~v9xJJJRjDy*vI
zdVy~Vx~s4b<owABXkTZw9MKjZ(_>@r%(o{yc0D&T(cK(?7rCb?=)sAn^YgXGP%A+F
z4eAX{WZb<?C^=*Sf+UPgo+o=!c5f;jX`7ont^O9h$ae2d1$1HjG1p|wHjg3pWx8Gi
zI@e@B@<{Xd8{Sm$kfZS!<X4&dcRzMTX^0RZ2bjpk&`T(UDKG;dm(8Ob(j*!WYi4!?
z{?V!(vF*j}J}qpDpDY{3f2^8?p_8eJvWt_Yo%t{0=8`mQx5$VRbPV+aDc~r2i3n1N
zgf?t>4rVPcW|M5kk=9mbW-389A!4(TLA3#fm<IdBg1pYih{6y9a<r6|2`!uKWUP52
zt5C5Ey(Nb%QGFybwxtoF0-_YU+$55%mu9QqNA3ND%H#u9%#oA|O*2}5#5oq*IB?II
zrT6d^t%Ie8K?`uAvqcA!CQg}b#MH7hhXb;c=M0wXlAtS20Ze}VJTW`d_!gr;EPvW~
z^YZ?hcDG^yNmT~2jY<$=*^=T#U0kUi+4S|RGW-ecHNIxXa}-`HHxG{~!h@XX`V3U9
zNwrEFW2!*QNXEOccB~KVh)QI}w7k>(_?8>Kl(ph>$ZW|g#EEvFS?M+k^5KP&d_@QJ
znYU2|q(Y@$e2g(Al%#fz70164T{wdpM^IhyuI$J?st6WO2o2u0YutMi#dc0W=@u%`
z7NEDrkLD4H#D=V029)E3!>y>b3pokN^hTc5>zR2p=7{#EiLil%L(=sSrzxi;kM7y$
z<_CXNB)?GT*WuXdMd~0>g^>zKg~u6iDgd6s=!{}?n+30<W)bt}tJ}uOe+TFm$7fgY
zT8Cf?V{E<DCL@Y&HG6=k{n$9tIslV8S1b}tqiNSJP--ra09uEcZ|6=7ZYj8V%KH61
zC&**VEZzA83E?Mry#50kKeK`VN#6XC9{ioc`IQ_DitUW}%7`I$4FMAI@J^fwMi5cv
zAZ=9LhA{fE@N)5E+%?97cMXAQ$L6NP=q7vG9q$)>Go*OBsb=tCpfR>Z<%#zKJwT|6
zb8iU)mYz4xaPm!iDukSzRCr&U1}1z}up-$5PM2@@d{qqWmpJ~ddC723#(~>N{ISwv
zE88=D=voH3x??)vJM}<rJ|#`iLCiZMUb|eth{V}wkR(@}0e_AJSHIZd*?S|QefO(O
z>vu?y1-3(j=U1@*Gy<e&IPCRLPfznSKL4p!ur+ltG%<8B{FSvz82rf#v1_Ow$dK2}
zn~kyrB1#5iCp1t26o}1)i6W6yMBtM7>=7XEw@QcH1Ld@qH;vB6xN02U=JW8qCIJ<<
zK59-OdM{1y%ePiD*?SUdk~(QCJB^2tKi$ZlpNecU1_mHRLHZPXra3pDkq%%H=4tMX
zO~xRN3l%UQiSCgGNYNX)sp%wb<~tbhW?`s#<4^P8nwua{@9-vehG*Bs-^f|`lIO%9
zu5FPOtO4q#Iw3BDalUt?DUTJ3goY1{-N|IH*f2H=yR@&amJzi(ZAJMVw7lt#+Pj7P
zNcyo`J>-aysuD@5x32Cn!n~3XO=iIb$30KN?@JAZy^M^pK33Q0q5+Y1ZlRV|P-6;b
z>~>%9;u^sZUP~b<Gma>Cix@?@X0);gVP%3DG3D?L(Y|ci{JW*M1V~ZFzJw<TT~}|F
zzw@sa^7?8L$qxJ3PP?@vNnzn_Y4|j^cY`NqRYU~q?1)hhMp`%B$f8`ssrmU=K(8Uk
z>&Xp;DD1abqU74krqH{<?nWo&>h4Jv#Afsuh_qfUsq}>z2XJKOnxJ=l%w4B)^xZ^|
zI)B=v`8&u**WT8CeVSrAOfWFYKS1vAWcXZ6os>;oTz*<WhG)N--WXZh9jFXTEh*se
zu~Z%I6d++NxhUq*I_@AOepyyc$#avM2qI%?bYyZ-f{7Z46BW%5xWVI>`1nTm>P52~
zNe{F`?sfsoT=M6rHSwFH&6d?sJ}!>yI3IRWAE5|H+(TNY)__4?VV!QSl47GZh=S;e
z^s5WXCG3SXw5e7d2^xqW+jBG@cN@Opsl$`ZJC*OMB;R358#kVrrk-&Sq!H>rCJyZQ
z9KG2fsHmIXyF2X4eatw^n@eYCe6@!8WGrYHZ_CX*FP#H?cy974BX43vrcRN#9}~Fo
zbT||O!y7EB)pBt)HcC+^O_ohm%*$Eq#~M=D#%ZeUO)g|sE9qP|s1R8&n;sND{TLU5
z8AJe|3``U^Ous&-3jfZnw`S`C?qQgW;2w!5VxE`ta$$f`^3VhY6a#8sw!+-m4dH9L
z+x=>BOHKl?z&mUPs$4|!-2wOJ`|@jMPLXFyPhZiv>%f(qeW+5u<t{5c6FULH-VMER
zn}bj>->qIPvRlg;rRsWht&9Kz!rpaY$V6SF=;Id$Uf%|B%ez*mv*G5vry_<61OJE1
zP)-N^(<J{L1|xWf7#UA3y-#11KVV>NXk#p5VQ6Xhlj<fhoxk=Xj{_c2uI!XCMe{6?
zbM&)`D)X$-CD_UFMITq@0<jq&Sdh&M@b#FAC{0hp5pB}2Fsfv8w+A{N+?EN1B!ylv
zkx@X{qv8CxEUv*hnE!09im!ptsI-+hV?-#HL^0g`fmbO;qj)$mnF~E;JxmJ0YqlPm
z(E7zihU$EWDe|{j<m|6GH>wZN`%`H9tAU_@G}{bY+3!T25N-KXhlu)A%3)$}tl(tt
z;LKob?_~P(S)Qs9|5w5BG{;d1it=5=7{RNu_sEFH^tmNwB(@)m<|naa)5mW@92!vJ
z$=|!(T~D}`Oy91(PInd<X(GuwR>gc5;95NcMLGZ}mhDNOw}Q1}*%oF_<&<gJS*#`E
zkF++{+S=OR^trYE#K0P2M%qD<*z#=?_1K8F2$P!+bVL&wrwa;4o$63%?y^zW4bLLD
z9A%<)X$MOuZx=lyI|M3Wd;qe<xnT(sF=q%IhQ%?XBn;@vtMc0e*BJHd!UT|kaG~)M
zllF-o!IC#6wDBaXB+H>u&^;ueG&xpxT4T>moj@T4Uakph%UXMdBRiM8pQFbm=B;o`
zcLWyz?ruc_g(Fmd#hK5c1&@zF6eD1~y;ssRb7iFryGVx85-X9FqK2)hU_ME2SZ{IL
zZ>T}&4&D{v)Xzwqg_$%H%rs_{|LrZ*Kar?xu3|Ih33)hAxJ3Cg@(dju{s+7##Qo<;
zPmr}={8<JHaYcl%jL)^KfZ$(hB+YSAY4{?+&0Ma)_;WQ`SXBJMtbG0Wl%@MZG!cUy
zAL$pn*bG`P8I!<@ZYRYE@HW`G%R4FFgLd6_Xi!WycseH<;phpC)5oh{WZ_WJwev`|
zJ&HvK3DlJmEUO^2fc2vp6nRLTg_aB=lNy2Uodnz$bQObV;_LC_vl{w6HJ?8bsPjEm
zSP~9(yp3&99_r9~7c;I2k?!}!Pa_dLI3%*-ZJ^wMr?P1?eX2;c&qRL0xr!|!r;fSt
z^842+XZhJjs3D(iJ18cKw^d_9L}>a!1I8^_J@&)|4m9H;)oWbFh}G1%#@OMBAj}E$
zx-c0jvrZL)t|qrvi?Lo@a83@?1PByyOO2vSnr;#TX^3PX=u;;-US^qA^bu@g>j=XJ
zXlQ%JzN~F%eZDFrT}Z!g(asmkKPbJzS{$IGMwQ#>if!Rx_gllxr$(V%v!GL#465xq
zkE?uVT5S<HPB;mh^;YP<A)D$QmlgmACHDbOv+;)`cmYoTwD$SuS26xOXaBwa!;2XT
z(tlO(*Fy0B3jVxyJrUziW#P{SpBKme7TtMzE#z6L>~rD2R`C561p|BkRDkvG^?c9u
zJTKY$t!WnF|KG&l3b>wYd7c&ft)&_JA9G~S6+GW<`>i0C=$C@udvDK0pD$^Di+Ym%
zA^LoQ`&`5GmCtVtNfgh=;2+mP&lNsjNc>iq{1kLPP0pW}70-pAhp4}WJ*j^QKMPR*
zF<^bJ^m)MZTj_h+UrPTH{ydldYmD(*77R?94h-yX5yx}!zdDLPi}$?wllXt!hJrNI
U6a2xzke)uDpBNO*^z+yM1GEqh6aWAK

literal 0
HcmV?d00001


From 52c6a67af4c58e00eb66712e376a7d7c8e7e05bc Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 19 Dec 2024 00:08:42 -0800
Subject: [PATCH 02/30] Eliminate Unused Statement

---
 tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
index a7edf6b7ed..e41b2190ed 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php
@@ -19,7 +19,6 @@ public function testRowBreaks(): void
         $spreadsheet->disconnectWorksheets();
         $reloadedSheet = $reloadedSpreadsheet->getActiveSheet();
         self::assertSame(['t' => 'array', 'ref' => 'E3:F7'], $reloadedSheet->getCell('E3')->getFormulaAttributes());
-        $group = $reloadedSheet->rangeToArray('E3:F8');
         $expected = [
             ['Design', '$505,000 '],
             ['Development', '$346,000 '],

From 2c95ec3bc86a9b7e0d4b65ff3723cd9dbb78fbc0 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 26 Dec 2024 23:07:30 -0800
Subject: [PATCH 03/30] Document Styling Whole Columns and Rows

Fix #4285. Documentation change only - no changed code. It is not clear to me why using individual set options when styling an entire column works differently than applyFromArray, but the latter produces the expected result and the former doesn't. I will continue to research why. However, in the meantime, we can at least document that applyFromArray is preferred for this operation.
---
 docs/topics/recipes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index 8b27155d90..c768c49f7e 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -925,6 +925,8 @@ getStyle('A1:M500'), rather than styling the cells individually in a
 loop. This is much faster compared to looping through cells and styling
 them individually.
 
+**Tip** If you are styling entire row(s) or column(s), e.g. getStyle('A:A'), it is recommended to use applyFromArray as described below rather than setting the styles individually as described above.
+
 There is also an alternative manner to set styles. The following code
 sets a cell's style to font bold, alignment right, top border thin and a
 gradient fill:

From 7e24333f729477734bbaf3c92ef26f322e6cbe33 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 2 Jan 2025 09:59:34 -0800
Subject: [PATCH 04/30] Upgrade mitoteam/jpgraph

They have made a change at our request to help us eliminate runInSeparateProcess for one or more tests. This will be helpful when we get to PhpUnit 11 (not imminent, since it doesn't support Php8.1, but it will happen eventually).
---
 composer.lock                                        | 12 ++++++------
 .../Chart/ChartsDynamicTitleTest.php                 |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3025170cb3..cc706e608e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1221,16 +1221,16 @@
         },
         {
             "name": "mitoteam/jpgraph",
-            "version": "10.4.3",
+            "version": "10.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mitoteam/jpgraph.git",
-                "reference": "f0db97108aec23a3bbb34721365931af992b83b3"
+                "reference": "9ad8e2fcc30f765c788a28543e9705fb541d499f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/f0db97108aec23a3bbb34721365931af992b83b3",
-                "reference": "f0db97108aec23a3bbb34721365931af992b83b3",
+                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/9ad8e2fcc30f765c788a28543e9705fb541d499f",
+                "reference": "9ad8e2fcc30f765c788a28543e9705fb541d499f",
                 "shasum": ""
             },
             "require": {
@@ -1270,9 +1270,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mitoteam/jpgraph/issues",
-                "source": "https://github.com/mitoteam/jpgraph/tree/10.4.3"
+                "source": "https://github.com/mitoteam/jpgraph/tree/10.4.4"
             },
-            "time": "2024-12-01T06:36:31+00:00"
+            "time": "2025-01-01T05:39:20+00:00"
         },
         {
             "name": "mpdf/mpdf",
diff --git a/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php b/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php
index 7aa484d9cb..2546d60de6 100644
--- a/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php
@@ -34,7 +34,6 @@ public function writeCharts(XlsxWriter $writer): void
         $writer->setIncludeCharts(true);
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
     public function testDynamicTitle(): void
     {
         // based on samples/templates/issue.3797.2007.xlsx

From 27563525cc7f60302ab075ad1b436e6d89419db0 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 4 Jan 2025 21:20:45 -0800
Subject: [PATCH 05/30] Update License

Someone opened a PR to do this a few days ago. I posted a comment. When I was ready to return to the ticket, I couldn't find it as opened or closed. It seemed like a reasonable idea. I will submit this PR for now and sit on it for about a week to give the original author a chance to resubmit.
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 3ec5723dde..04a90f083e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 PhpSpreadsheet Authors
+Copyright (c) 2019-2025 PhpSpreadsheet Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From dcc25637f2ac1eb734bc020ae50693589e7885c7 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:40:29 -0800
Subject: [PATCH 06/30] Retitling Cloned Worksheets

Fix #641 (marked stale in 2018, but now reopened). When a sheet's title is changed, PhpSpreadsheet updates references to the old sheet name found in formulas. Which is a good idea when the sheet is attached to the spreadsheet, but a bad idea when it isn't (often because it has been cloned without re-attaching to the spreadsheet). This PR continues to change formulas in the former case, but will no longer do so for the latter.
---
 src/PhpSpreadsheet/Spreadsheet.php            | 10 +++
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |  6 +-
 .../Worksheet/Issue641Test.php                | 82 +++++++++++++++++++
 3 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php

diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 943db95cc3..530a56da8f 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -514,6 +514,16 @@ public function getActiveSheet(): Worksheet
     public function createSheet(?int $sheetIndex = null): Worksheet
     {
         $newSheet = new Worksheet($this);
+        $title = $newSheet->getTitle();
+        if ($this->sheetNameExists($title)) {
+            $i = 1;
+            $newTitle = "$title $i";
+            while ($this->sheetNameExists($newTitle)) {
+                ++$i;
+                $newTitle = "$title $i";
+            }
+            $newSheet->setTitle($newTitle);
+        }
         $this->addSheet($newSheet, $sheetIndex);
 
         return $newSheet;
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 546a6ffe5b..a3ee4818b0 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -321,6 +321,7 @@ public function __construct(?Spreadsheet $parent = null, string $title = 'Worksh
     {
         // Set parent and title
         $this->parent = $parent;
+        $this->hash = spl_object_id($this);
         $this->setTitle($title, false);
         // setTitle can change $pTitle
         $this->setCodeName($this->getTitle());
@@ -349,7 +350,6 @@ public function __construct(?Spreadsheet $parent = null, string $title = 'Worksh
         $this->autoFilter = new AutoFilter('', $this);
         // Table collection
         $this->tableCollection = new ArrayObject();
-        $this->hash = spl_object_id($this);
     }
 
     /**
@@ -869,7 +869,7 @@ public function setTitle(string $title, bool $updateFormulaCellReferences = true
             // Syntax check
             self::checkSheetTitle($title);
 
-            if ($this->parent) {
+            if ($this->parent && $this->parent->getIndex($this, true) >= 0) {
                 // Is there already such sheet name?
                 if ($this->parent->sheetNameExists($title)) {
                     // Use name, but append with lowest possible integer
@@ -899,7 +899,7 @@ public function setTitle(string $title, bool $updateFormulaCellReferences = true
         // Set title
         $this->title = $title;
 
-        if ($this->parent && $this->parent->getCalculationEngine()) {
+        if ($this->parent && $this->parent->getIndex($this, true) >= 0 && $this->parent->getCalculationEngine()) {
             // New title
             $newTitle = $this->getTitle();
             $this->parent->getCalculationEngine()
diff --git a/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php b/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php
new file mode 100644
index 0000000000..bbb6c8bf00
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class Issue641Test extends TestCase
+{
+    /**
+     * Problem cloning sheet referred to in formulas.
+     */
+    public function testIssue641(): void
+    {
+        $xlsx = new Spreadsheet();
+        $xlsx->removeSheetByIndex(0);
+        $availableWs = [];
+
+        $worksheet = $xlsx->createSheet();
+        $worksheet->setTitle('Condensed A');
+        $worksheet->getCell('A1')->setValue("=SUM('Detailed A'!A1:A10)");
+        $worksheet->getCell('A2')->setValue(mt_rand(1, 30));
+        $availableWs[] = 'Condensed A';
+
+        $worksheet = $xlsx->createSheet();
+        $worksheet->setTitle('Condensed B');
+        $worksheet->getCell('A1')->setValue("=SUM('Detailed B'!A1:A10)");
+        $worksheet->getCell('A2')->setValue(mt_rand(1, 30));
+        $availableWs[] = 'Condensed B';
+
+        // at this point the value in worksheet 'Condensed B' cell A1 is
+        // =SUM('Detailed B'!A1:A10)
+
+        // worksheet in question is cloned and totals are attached
+        $totalWs1 = clone $xlsx->getSheet($xlsx->getSheetCount() - 1);
+        $totalWs1->setTitle('Condensed Total');
+        $xlsx->addSheet($totalWs1);
+        $formula = '=';
+        foreach ($availableWs as $ws) {
+            $formula .= sprintf("+'%s'!A2", $ws);
+        }
+        $totalWs1->getCell('A1')->setValue("=SUM('Detailed Total'!A1:A10)");
+        $totalWs1->getCell('A2')->setValue($formula);
+
+        $availableWs = [];
+
+        $worksheet = $xlsx->createSheet();
+        $worksheet->setTitle('Detailed A');
+        for ($step = 1; $step <= 10; ++$step) {
+            $worksheet->getCell("A{$step}")->setValue(mt_rand(1, 30));
+        }
+        $availableWs[] = 'Detailed A';
+
+        $worksheet = $xlsx->createSheet();
+        $worksheet->setTitle('Detailed B');
+        for ($step = 1; $step <= 10; ++$step) {
+            $worksheet->getCell("A{$step}")->setValue(mt_rand(1, 30));
+        }
+        $availableWs[] = 'Detailed B';
+
+        $totalWs2 = clone $xlsx->getSheet($xlsx->getSheetCount() - 1);
+        $totalWs2->setTitle('Detailed Total');
+        $xlsx->addSheet($totalWs2);
+
+        for ($step = 1; $step <= 10; ++$step) {
+            $formula = '=';
+            foreach ($availableWs as $ws) {
+                $formula .= sprintf("+'%s'!A%s", $ws, $step);
+            }
+            $totalWs2->getCell("A{$step}")->setValue($formula);
+        }
+
+        self::assertSame("=SUM('Detailed A'!A1:A10)", $xlsx->getSheetByName('Condensed A')?->getCell('A1')?->getValue());
+        self::assertSame("=SUM('Detailed B'!A1:A10)", $xlsx->getSheetByName('Condensed B')?->getCell('A1')?->getValue());
+        self::assertSame("=SUM('Detailed Total'!A1:A10)", $xlsx->getSheetByName('Condensed Total')?->getCell('A1')?->getValue());
+        self::assertSame("=+'Detailed A'!A1+'Detailed B'!A1", $xlsx->getSheetByName('Detailed Total')?->getCell('A1')?->getValue());
+
+        $xlsx->disconnectWorksheets();
+    }
+}

From ac5d3706a4b7fcf42bdd4eeaaac6ff39f2bd0e4d Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:56:53 -0800
Subject: [PATCH 07/30] Add Parameter retitleIfNeeded to AddSheet

A little more useful than my first crack at this.
---
 src/PhpSpreadsheet/Spreadsheet.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 530a56da8f..b044f1d8a4 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -515,16 +515,7 @@ public function createSheet(?int $sheetIndex = null): Worksheet
     {
         $newSheet = new Worksheet($this);
         $title = $newSheet->getTitle();
-        if ($this->sheetNameExists($title)) {
-            $i = 1;
-            $newTitle = "$title $i";
-            while ($this->sheetNameExists($newTitle)) {
-                ++$i;
-                $newTitle = "$title $i";
-            }
-            $newSheet->setTitle($newTitle);
-        }
-        $this->addSheet($newSheet, $sheetIndex);
+        $this->addSheet($newSheet, $sheetIndex, true);
 
         return $newSheet;
     }
@@ -545,8 +536,20 @@ public function sheetNameExists(string $worksheetName): bool
      * @param Worksheet $worksheet The worksheet to add
      * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
      */
-    public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet
+    public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null, bool $retitleIfNeeded = false): Worksheet
     {
+        if ($retitleIfNeeded) {
+            $title = $worksheet->getTitle();
+            if ($this->sheetNameExists($title)) {
+                $i = 1;
+                $newTitle = "$title $i";
+                while ($this->sheetNameExists($newTitle)) {
+                    ++$i;
+                    $newTitle = "$title $i";
+                }
+                $worksheet->setTitle($newTitle);
+            }
+        }
         if ($this->sheetNameExists($worksheet->getTitle())) {
             throw new Exception(
                 "Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename this worksheet first."

From 0ecf9c22731d3049bd71c122b0a105ef329b1acd Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:59:04 -0800
Subject: [PATCH 08/30] Eliminate Unneeded Statement

---
 src/PhpSpreadsheet/Spreadsheet.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index b044f1d8a4..f40a8889ac 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -514,7 +514,6 @@ public function getActiveSheet(): Worksheet
     public function createSheet(?int $sheetIndex = null): Worksheet
     {
         $newSheet = new Worksheet($this);
-        $title = $newSheet->getTitle();
         $this->addSheet($newSheet, $sheetIndex, true);
 
         return $newSheet;

From 77f3f17ee87c6d77378d4998ec5ca772c785b267 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 7 Jan 2025 16:49:37 -0800
Subject: [PATCH 09/30] getStyle Accept RowRange or ColumnRange Using Phpstan

Fix #4309. No executable source code is changed, just some doc blocks, and some new tests added.
---
 src/PhpSpreadsheet/Worksheet/AutoFilter.php   |  2 +-
 src/PhpSpreadsheet/Worksheet/Table.php        |  4 ++--
 src/PhpSpreadsheet/Worksheet/Validations.php  |  4 ++--
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 14 ++++++-------
 .../Cell/ColumnRangeTest.php                  | 20 +++++++++++++++++++
 .../PhpSpreadsheetTests/Cell/RowRangeTest.php | 17 ++++++++++++++++
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php
index 2c4a469559..4b88fcadc9 100644
--- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php
+++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -50,7 +50,7 @@ public function setEvaluated(bool $value): void
     /**
      * Create a new AutoFilter.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
      *            A simple string containing a Cell range like 'A1:E10' is permitted
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange object.
diff --git a/src/PhpSpreadsheet/Worksheet/Table.php b/src/PhpSpreadsheet/Worksheet/Table.php
index 234014a0ff..a7a62a954c 100644
--- a/src/PhpSpreadsheet/Worksheet/Table.php
+++ b/src/PhpSpreadsheet/Worksheet/Table.php
@@ -64,7 +64,7 @@ class Table implements Stringable
     /**
      * Create a new Table.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
      *            A simple string containing a Cell range like 'A1:E10' is permitted
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange object.
@@ -268,7 +268,7 @@ public function getRange(): string
     /**
      * Set Table Cell Range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
      *            A simple string containing a Cell range like 'A1:E10' is permitted
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange object.
diff --git a/src/PhpSpreadsheet/Worksheet/Validations.php b/src/PhpSpreadsheet/Worksheet/Validations.php
index 99b5eedbc5..ec78c22b0b 100644
--- a/src/PhpSpreadsheet/Worksheet/Validations.php
+++ b/src/PhpSpreadsheet/Worksheet/Validations.php
@@ -36,7 +36,7 @@ public static function validateCellAddress(null|CellAddress|string|array $cellAd
     /**
      * Validate a cell address or cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
      *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
      *               or as a CellAddress or AddressRange object.
      */
@@ -59,7 +59,7 @@ public static function validateCellOrCellRange(AddressRange|CellAddress|int|stri
     /**
      * Validate a cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
      *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
      *               or as an AddressRange object.
      */
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 546a6ffe5b..9f9457f644 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1389,7 +1389,7 @@ public function getStyles(): array
     /**
      * Get style for cell.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellCoordinate
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellCoordinate
      *              A simple string containing a cell address like 'A1' or a cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or a CellAddress or AddressRange object.
@@ -1693,7 +1693,7 @@ public function getColumnBreaks(): array
     /**
      * Set merge on a cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange.
      * @param string $behaviour How the merged cells should behave.
@@ -1818,7 +1818,7 @@ public function mergeCellBehaviour(Cell $cell, string $upperLeft, string $behavi
     /**
      * Remove merge on a cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange.
      *
@@ -1869,7 +1869,7 @@ public function setMergeCells(array $mergeCells): static
     /**
      * Set protection on a cell or cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or a CellAddress or AddressRange object.
      * @param string $password Password to unlock the protection
@@ -1892,7 +1892,7 @@ public function protectCells(AddressRange|CellAddress|int|string|array $range, s
     /**
      * Remove protection on a cell or cell range.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or a CellAddress or AddressRange object.
      *
@@ -1950,7 +1950,7 @@ public function getAutoFilter(): AutoFilter
     /**
      * Set AutoFilter.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|AutoFilter|string $autoFilterOrRange
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|AutoFilter|string $autoFilterOrRange
      *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange.
@@ -2696,7 +2696,7 @@ public function setSelectedCell(string $coordinate): static
     /**
      * Select a range of cells.
      *
-     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10'
+     * @param AddressRange<CellAddress>|AddressRange<int>|AddressRange<string>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or a CellAddress or AddressRange object.
      *
diff --git a/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php b/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php
index 10da1dd21c..f15352aee9 100644
--- a/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php
@@ -43,6 +43,7 @@ public function testCreateColumnRangeWithWorksheet(): void
         self::assertSame('E', $columnRange->to());
         self::assertSame("'Mark''s Worksheet'!C:E", (string) $columnRange);
         self::assertSame("'Mark''s Worksheet'!C1:E1048576", (string) $columnRange->toCellRange());
+        $spreadsheet->disconnectWorksheets();
     }
 
     public function testCreateColumnRangeFromArray(): void
@@ -88,4 +89,23 @@ public function testColumnRangePrevious(): void
         // Check that original Column Range isn't changed
         self::assertSame('C:E', (string) $columnRange);
     }
+
+    public function testIssue4309(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $columnRange = new ColumnRange('A', 'A');
+        $columnStyle = $sheet->getStyle($columnRange);
+        $columnStyle->applyFromArray([
+            'font' => ['bold' => true],
+        ]);
+        $columnXf = $sheet->getColumnDimension('A')->getXfIndex();
+        self::assertNotNull($columnXf);
+        self::assertTrue(
+            $spreadsheet->getCellXfByIndex($columnXf)
+                ->getFont()->getBold()
+        );
+
+        $spreadsheet->disconnectWorksheets();
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php b/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php
index 52fd357f51..005f1af6b2 100644
--- a/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php
@@ -39,6 +39,7 @@ public function testCreateRowRangeWithWorksheet(): void
         self::assertSame(3, $rowRange->from());
         self::assertSame(5, $rowRange->to());
         self::assertSame("'Mark''s Worksheet'!3:5", (string) $rowRange);
+        $spreadsheet->disconnectWorksheets();
     }
 
     public function testCreateRowRangeFromArray(): void
@@ -74,4 +75,20 @@ public function testRowRangePrevious(): void
         // Check that original Row Range isn't changed
         self::assertSame('3:5', (string) $rowRange);
     }
+
+    public function testIssue4309(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $rowRange = new RowRange(1, 1);
+        $rowStyle = $sheet->getStyle($rowRange);
+        $rowStyle->applyFromArray([
+            'font' => ['name' => 'Arial'],
+        ]);
+        $rowXf = $sheet->getRowDimension(1)->getXfIndex();
+        self::assertNotNull($rowXf);
+        self::assertSame('Arial', $spreadsheet->getCellXfByIndex($rowXf)->getFont()->getName());
+
+        $spreadsheet->disconnectWorksheets();
+    }
 }

From decc0a4d09e4db07b606a62b06c3645e4181ba45 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:29:38 -0800
Subject: [PATCH 10/30] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00f19a8cd4..1d78534a3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Xlsx Reader Shared Formula with Boolean Result. Partial solution for [Issue #4280](https://github.com/PHPOffice/PhpSpreadsheet/issues/4280) [PR #4281](https://github.com/PHPOffice/PhpSpreadsheet/pull/4281)
+- Retitling cloned Worksheets. [Issue #641](https://github.com/PHPOffice/PhpSpreadsheet/issues/641) [PR #4302](https://github.com/PHPOffice/PhpSpreadsheet/pull/4302)
 
 ## 2024-12-26 - 3.7.0
 

From bfcfaeea8ed27fa1a495d6752ec0ec640898c3d5 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:04:47 -0800
Subject: [PATCH 11/30] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d78534a3e..51defbef9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Xlsx Reader Shared Formula with Boolean Result. Partial solution for [Issue #4280](https://github.com/PHPOffice/PhpSpreadsheet/issues/4280) [PR #4281](https://github.com/PHPOffice/PhpSpreadsheet/pull/4281)
 - Retitling cloned Worksheets. [Issue #641](https://github.com/PHPOffice/PhpSpreadsheet/issues/641) [PR #4302](https://github.com/PHPOffice/PhpSpreadsheet/pull/4302)
+- Extremely limited support for GROUPBY function. Partial response to [Issue #4282](https://github.com/PHPOffice/PhpSpreadsheet/issues/4282) [PR #4283](https://github.com/PHPOffice/PhpSpreadsheet/pull/4283)
 
 ## 2024-12-26 - 3.7.0
 

From 3d98d34b8ee36e57a5e30bcd1263a2ce21ba8701 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 9 Jan 2025 23:16:39 -0800
Subject: [PATCH 12/30] Ods Reader Sheet Names with Period in Addresses and
 Formulas

Fix #4311. Period is a valid character in a sheet name. When a sheet with such a name is referenced in Ods format, the sheet name must be enclosed in apostrophes, because Ods uses period to separate sheet name from cell address. (Excel uses exclamation point so doesn't necessarily need to enclose the sheet name in apostrophes.) This causes a problem for the Ods Reader whenever it tries to parse such an address; however, the problem showed up specifically for auto filters, because the Ods xml for those specifies *'sheetname'.startcell:'sheetname'.endcell* (Excel omits sheetname).

Ods Reader translates these addresses in 2 different methods in FormulaTranslator. I had a relatively elegant method for handling this situation in convertToExcelAddressValue, but I could not make it work in convertToExcelFormulaValue. A kludgier method works for Formula, and also for Address. I decided it's better to be consistent, so I'm going with the kludgier method for both.

It would not surprise me in the least if there are similar problems lying in wait for other special characters in sheet names, and for other formats besides Ods. For now, I will limit myself to fixing the known problem.
---
 .../Reader/Ods/FormulaTranslator.php          | 26 ++++++--
 .../Reader/Ods/FormulaTranslatorTest.php      | 62 +++++++++++++++++++
 .../Writer/Ods/AutoFilterTest.php             | 25 ++++++++
 3 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php

diff --git a/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php b/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
index 27862d7a5a..6e54e0039e 100644
--- a/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
+++ b/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
@@ -6,10 +6,24 @@
 
 class FormulaTranslator
 {
-    public static function convertToExcelAddressValue(string $openOfficeAddress): string
+    private static function replaceQuotedPeriod(string $value): string
     {
-        $excelAddress = $openOfficeAddress;
+        $value2 = '';
+        $quoted = false;
+        foreach (mb_str_split($value, 1, 'UTF-8') as $char) {
+            if ($char === "'") {
+                $quoted = !$quoted;
+            } elseif ($char === '.' && $quoted) {
+                $char = "\u{fffe}";
+            }
+            $value2 .= $char;
+        }
 
+        return $value2;
+    }
+
+    public static function convertToExcelAddressValue(string $openOfficeAddress): string
+    {
         // Cell range 3-d reference
         // As we don't support 3-d ranges, we're just going to take a quick and dirty approach
         //  and assume that the second worksheet reference is the same as the first
@@ -20,6 +34,7 @@ public static function convertToExcelAddressValue(string $openOfficeAddress): st
                 '/\$?([^\.]+)\.([^\.]+)/miu', // Cell reference in another sheet
                 '/\.([^\.]+):\.([^\.]+)/miu', // Cell range reference
                 '/\.([^\.]+)/miu', // Simple cell reference
+                '/\\x{FFFE}/miu', // restore quoted periods
             ],
             [
                 '$1!$2:$4',
@@ -27,8 +42,9 @@ public static function convertToExcelAddressValue(string $openOfficeAddress): st
                 '$1!$2',
                 '$1:$2',
                 '$1',
+                '.',
             ],
-            $excelAddress
+            self::replaceQuotedPeriod($openOfficeAddress)
         );
 
         return $excelAddress;
@@ -52,14 +68,16 @@ public static function convertToExcelFormulaValue(string $openOfficeFormula): st
                         '/\[\$?([^\.]+)\.([^\.]+)\]/miu', // Cell reference in another sheet
                         '/\[\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference
                         '/\[\.([^\.]+)\]/miu', // Simple cell reference
+                        '/\\x{FFFE}/miu', // restore quoted periods
                     ],
                     [
                         '$1!$2:$3',
                         '$1!$2',
                         '$1:$2',
                         '$1',
+                        '.',
                     ],
-                    $value
+                    self::replaceQuotedPeriod($value)
                 );
                 // Convert references to defined names/formulae
                 $value = str_replace('$$', '', $value);
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php
new file mode 100644
index 0000000000..8246784bf3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Reader\Ods\FormulaTranslator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+class FormulaTranslatorTest extends TestCase
+{
+    #[DataProvider('addressesProvider')]
+    public function testAddresses(string $result, string $address): void
+    {
+        self::assertSame($result, FormulaTranslator::convertToExcelAddressValue($address));
+    }
+
+    public static function addressesProvider(): array
+    {
+        return [
+            'range period in sheet name' => ["'sheet1.bug'!a1:a5", "'sheet1.bug'.a1:'sheet1.bug'.a5"],
+            'range special chars and period in sheet name' => ["'#sheet1.x'!a1:a5", "'#sheet1.x'.a1:'#sheet1.x'.a5"],
+            'cell period in sheet name' => ["'sheet1.bug'!b9", "'sheet1.bug'.b9"],
+            'range unquoted sheet name' => ['sheet1!b9:c12', 'sheet1.b9:sheet1.c12'],
+            'range unquoted sheet name with $' => ['sheet1!$b9:c$12', 'sheet1.$b9:sheet1.c$12'],
+            'range quoted sheet name with $' => ["'sheet1'!\$b9:c\$12", '\'sheet1\'.$b9:\'sheet1\'.c$12'],
+            'cell unquoted sheet name' => ['sheet1!B$9', 'sheet1.B$9'],
+            'range no sheet name all dollars' => ['$B$9:$C$12', '$B$9:$C$12'],
+            'range no sheet name some dollars' => ['B$9:$C12', 'B$9:$C12'],
+            'range no sheet name no dollars' => ['B9:C12', 'B9:C12'],
+        ];
+    }
+
+    #[DataProvider('formulaProvider')]
+    public function testFormulas(string $result, string $formula): void
+    {
+        self::assertSame($result, FormulaTranslator::convertToExcelFormulaValue($formula));
+    }
+
+    public static function formulaProvider(): array
+    {
+        return [
+            'ranges no sheet name' => [
+                'SUM(A5:A7,B$5:$B7)',
+                'SUM([.A5:.A7];[.B$5:.$B7])',
+            ],
+            'ranges sheet name with period' => [
+                'SUM(\'test.bug\'!A5:A7,\'test.bug\'!B5:B7)',
+                'SUM([\'test.bug\'.A5:.A7];[\'test.bug\'.B5:.B7])',
+            ],
+            'ranges unquoted sheet name' => [
+                'SUM(testbug!A5:A7,testbug!B5:B7)',
+                'SUM([testbug.A5:.A7];[testbug.B5:.B7])',
+            ],
+            'ranges quoted sheet name without period' => [
+                'SUM(\'testbug\'!A5:A7,\'testbug\'!B5:B7)',
+                'SUM([\'testbug\'.A5:.A7];[\'testbug\'.B5:.B7])',
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php
index ddfe85570a..952db5cb5b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php
@@ -32,4 +32,29 @@ public function testAutoFilterWriter(): void
 
         self::assertSame('A1:C9', $reloaded->getActiveSheet()->getAutoFilter()->getRange());
     }
+
+    public function testPeriodInSheetNames(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle('work.sheet');
+
+        $dataSet = [
+            ['Year', 'Quarter', 'Sales'],
+            [2020, 'Q1', 100],
+            [2020, 'Q2', 120],
+            [2020, 'Q3', 140],
+            [2020, 'Q4', 160],
+            [2021, 'Q1', 180],
+            [2021, 'Q2', 75],
+            [2021, 'Q3', 0],
+            [2021, 'Q4', 0],
+        ];
+        $worksheet->fromArray($dataSet, null, 'A1');
+        $worksheet->getAutoFilter()->setRange('A1:C9');
+
+        $reloaded = $this->writeAndReload($spreadsheet, 'Ods');
+
+        self::assertSame('A1:C9', $reloaded->getActiveSheet()->getAutoFilter()->getRange());
+    }
 }

From 4088381ccfaf241d7d42c333de0dc8c98e338743 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 11 Jan 2025 18:00:07 -0800
Subject: [PATCH 13/30] Merge commit from fork

---
 src/PhpSpreadsheet/Writer/Html.php            |  2 +-
 .../Writer/Html/NavigationBadTitleTest.php    | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index d70a067f6f..48e8450352 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -561,7 +561,7 @@ public function generateNavigation(): string
             $html .= '<ul class="navigation">' . PHP_EOL;
 
             foreach ($sheets as $sheet) {
-                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . htmlspecialchars($sheet->getTitle()) . '</a></li>' . PHP_EOL;
                 ++$sheetId;
             }
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php b/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php
new file mode 100644
index 0000000000..284fd9f4e5
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Html as HtmlWriter;
+use PHPUnit\Framework\TestCase;
+
+class NavigationBadTitleTest extends TestCase
+{
+    public function testNavigationTitle(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getCell('A1')->setValue(1);
+        $sheet2 = $spreadsheet->createSheet();
+        $sheet2->setTitle('<img src=x onerror=alert(1)>');
+        $sheet2->getCell('A2')->setValue(2);
+
+        $writer = new HtmlWriter($spreadsheet);
+        $writer->writeAllSheets();
+        $html = $writer->generateHTMLAll();
+        $expected = '<ul class="navigation">'
+            . PHP_EOL
+            . '  <li class="sheet0"><a href="#sheet0">Worksheet</a></li>'
+            . PHP_EOL
+            . '  <li class="sheet1"><a href="#sheet1">&lt;img src=x onerror=alert(1)&gt;</a></li>'
+            . PHP_EOL
+            . '</ul>';
+        self::assertStringContainsString($expected, $html, 'appropriate characters are escaped');
+        $spreadsheet->disconnectWorksheets();
+    }
+}

From 949c799c3538f3158bcf6c5f4d8a403027be0fbd Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 11 Jan 2025 19:48:58 -0800
Subject: [PATCH 14/30] Prepare for New Release

---
 CHANGELOG.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51defbef9b..3549a766c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,11 @@ 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.8.0
+## TBD - 3.9.0
 
 ### Added
 
-- CHOOSECOLS, CHOOSEROWS, DROP, TAKE, and EXPAND. [PR #4286](https://github.com/PHPOffice/PhpSpreadsheet/pull/4286)
+- Nothing yet.
 
 ### Changed
 
@@ -25,6 +25,17 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Nothing yet.
+
+## 2025-01-11 - 3.8.0
+
+### Added
+
+- CHOOSECOLS, CHOOSEROWS, DROP, TAKE, and EXPAND. [PR #4286](https://github.com/PHPOffice/PhpSpreadsheet/pull/4286)
+
+### Fixed
+
+- Security patch for Html navigation.
 - Xlsx Reader Shared Formula with Boolean Result. Partial solution for [Issue #4280](https://github.com/PHPOffice/PhpSpreadsheet/issues/4280) [PR #4281](https://github.com/PHPOffice/PhpSpreadsheet/pull/4281)
 - Retitling cloned Worksheets. [Issue #641](https://github.com/PHPOffice/PhpSpreadsheet/issues/641) [PR #4302](https://github.com/PHPOffice/PhpSpreadsheet/pull/4302)
 - Extremely limited support for GROUPBY function. Partial response to [Issue #4282](https://github.com/PHPOffice/PhpSpreadsheet/issues/4282) [PR #4283](https://github.com/PHPOffice/PhpSpreadsheet/pull/4283)

From 7c1a65e17c9124c3337ac1f5f3e62f99b4f749ac Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 11 Jan 2025 22:20:40 -0800
Subject: [PATCH 15/30] Add Spreadsheet Method for Duplicating Worksheet

Cloning a worksheet attached to a spreadsheet creates a clone which is detached from the spreadsheet. This can have its uses, but I think it would also be useful to have the ability to duplicate the worksheet and keep the duplicate attached to the spreadsheet. You can do that in Excel and LibreOffice, and you can now do it in PhpSpreadsheet as well. The duplicated worksheet will come immediately after its source.

The worksheet being duplicated could be identified in a number of ways - by passing the worksheet itself to the new method, by passing the worksheet title, or by passing the index of the worksheet within the spreadsheet. For now, I am just implementing the one I think is most useful (title).
---
 docs/topics/worksheets.md                     | 27 +++++++--
 src/PhpSpreadsheet/Spreadsheet.php            |  9 +++
 .../SpreadsheetDuplicateSheetTest.php         | 59 +++++++++++++++++++
 3 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php

diff --git a/docs/topics/worksheets.md b/docs/topics/worksheets.md
index 0199f13c6a..5b15089b61 100644
--- a/docs/topics/worksheets.md
+++ b/docs/topics/worksheets.md
@@ -95,19 +95,38 @@ insert the clone into the workbook.
 
 ```php
 $clonedWorksheet = clone $spreadsheet->getSheetByName('Worksheet 1');
-$clonedWorksheet->setTitle('Copy of Worksheet 1');
+$clonedWorksheet->setTitle('Copy of Worksheet 1'); // must be unique
 $spreadsheet->addSheet($clonedWorksheet);
 ```
+Starting with PhpSpreadsheet 3.9.0, this can be done more simply (copied sheet's title will be set to something unique):
+```php
+$copiedWorksheet = $spreadsheet->duplicateWorksheetByTitle('sheetname');
+```
 
 You can also copy worksheets from one workbook to another, though this
 is more complex as PhpSpreadsheet also has to replicate the styling
 between the two workbooks. The `addExternalSheet()` method is provided for
 this purpose.
 
-    $clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1');
-    $spreadsheet->addExternalSheet($clonedWorksheet);
+```php
+$clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1');
+$clonedWorksheet->setTitle('Copy of Worksheet 1'); // must be unique
+$spreadsheet1->addSheet($clonedWorksheet);
+$spreadsheet->addExternalSheet($clonedWorksheet);
+```
+Starting with PhpSpreadsheet 3.8.0, this can be simplified:
+```php
+$clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1');
+$spreadsheet1->addSheet($clonedWorksheet, null, true);
+$spreadsheet->addExternalSheet($clonedWorksheet);
+```
+Starting with PhpSpreadsheet 3.9.0, this can be simplified even further:
+```php
+$clonedWorksheet = $spreadsheet1->duplicateWorksheetByTitle('sheetname');
+$spreadsheet->addExternalSheet($clonedWorksheet);
+```
 
-In both cases, it is the developer's responsibility to ensure that
+In the cases commented "must be unique", it is the developer's responsibility to ensure that
 worksheet names are not duplicated. PhpSpreadsheet will throw an
 exception if you attempt to copy worksheets that will result in a
 duplicate name.
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index f40a8889ac..bad772df9e 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -529,6 +529,15 @@ public function sheetNameExists(string $worksheetName): bool
         return $this->getSheetByName($worksheetName) !== null;
     }
 
+    public function duplicateWorksheetByTitle(string $title): Worksheet
+    {
+        $original = $this->getSheetByNameOrThrow($title);
+        $index = $this->getIndex($original) + 1;
+        $clone = clone $original;
+
+        return $this->addSheet($clone, $index, true);
+    }
+
     /**
      * Add sheet.
      *
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php b/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php
new file mode 100644
index 0000000000..b84026700e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class SpreadsheetDuplicateSheetTest extends TestCase
+{
+    private ?Spreadsheet $spreadsheet = null;
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+    }
+
+    public function testDuplicate(): void
+    {
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
+        $sheet->setTitle('original');
+        $sheet->getCell('A1')->setValue('text1');
+        $sheet->getCell('A2')->setValue('text2');
+        $sheet->getStyle('A1')
+            ->getFont()
+            ->setBold(true);
+        $sheet3 = $this->spreadsheet->createSheet();
+        $sheet3->setTitle('added');
+        $newSheet = $this->spreadsheet
+            ->duplicateWorksheetByTitle('original');
+        $this->spreadsheet->duplicateWorksheetByTitle('added');
+        self::assertSame('original 1', $newSheet->getTitle());
+        self::assertSame(
+            'text1',
+            $newSheet->getCell('A1')->getValue()
+        );
+        self::assertSame(
+            'text2',
+            $newSheet->getCell('A2')->getValue()
+        );
+        self::assertTrue(
+            $newSheet->getStyle('A1')->getFont()->getBold()
+        );
+        self::assertFalse(
+            $newSheet->getStyle('A2')->getFont()->getBold()
+        );
+        $sheetNames = [];
+        foreach ($this->spreadsheet->getWorksheetIterator() as $worksheet) {
+            $sheetNames[] = $worksheet->getTitle();
+        }
+        $expected = ['original', 'original 1', 'added', 'added 1'];
+        self::assertSame($expected, $sheetNames);
+    }
+}

From 4b3b0d45ad2c55310cacc5c8ca6359bed1b8b09e Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 13 Jan 2025 19:55:15 -0800
Subject: [PATCH 16/30] Get Style for Row or Column

This is the second recent occasion where style for whole row or column is behaving unexpectedly (see issue #4285). For the earlier issue, a documentation update was made to show the preferred method of styling. Setting styles for row(s) or column(s) in that way will work just fine, however retrieving the style doesn't yield the expected result. Although that problem can be overcome with existing code, simpler methods are needed, and this PR adds methods getRowStyle and getColumnStyle to Worksheet. I will continue to investigate why this problem and the one from 4285 have unexpected results.
---
 src/PhpSpreadsheet/Spreadsheet.php            |  5 ++
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 14 +++++
 .../Worksheet/ColumnRowStyleTest.php          | 63 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php

diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 943db95cc3..df5d6c0f0f 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -1080,6 +1080,11 @@ public function getCellXfByIndex(int $cellStyleIndex): Style
         return $this->cellXfCollection[$cellStyleIndex];
     }
 
+    public function getCellXfByIndexOrNull(?int $cellStyleIndex): ?Style
+    {
+        return ($cellStyleIndex === null) ? null : ($this->cellXfCollection[$cellStyleIndex] ?? null);
+    }
+
     /**
      * Get cellXf by hash code.
      *
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 546a6ffe5b..4c16eea00c 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1333,6 +1333,13 @@ public function getRowDimension(int $row): RowDimension
         return $this->rowDimensions[$row];
     }
 
+    public function getRowStyle(int $row): ?Style
+    {
+        return $this->parent?->getCellXfByIndexOrNull(
+            ($this->rowDimensions[$row] ?? null)?->getXfIndex()
+        );
+    }
+
     public function rowDimensionExists(int $row): bool
     {
         return isset($this->rowDimensions[$row]);
@@ -1376,6 +1383,13 @@ public function getColumnDimensionByColumn(int $columnIndex): ColumnDimension
         return $this->getColumnDimension(Coordinate::stringFromColumnIndex($columnIndex));
     }
 
+    public function getColumnStyle(string $column): ?Style
+    {
+        return $this->parent?->getCellXfByIndexOrNull(
+            ($this->columnDimensions[$column] ?? null)?->getXfIndex()
+        );
+    }
+
     /**
      * Get styles.
      *
diff --git a/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php b/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php
new file mode 100644
index 0000000000..d5197fb9c7
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class ColumnRowStyleTest extends TestCase
+{
+    public function testColumnStyle(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $columnStyle = $sheet->getStyle('B:C');
+        $columnStyle->applyFromArray([
+            'font' => ['name' => 'Who knows'],
+        ]);
+        self::assertSame(
+            'Who knows',
+            $sheet->getColumnStyle('B')?->getFont()->getName()
+        );
+        self::assertSame(
+            'Who knows',
+            $sheet->getColumnStyle('C')?->getFont()->getName()
+        );
+        self::assertNull(
+            $sheet->getColumnStyle('A')?->getFont()->getName()
+        );
+        self::assertNull(
+            $sheet->getColumnStyle('D')?->getFont()->getName()
+        );
+
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testRowStyle(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $rowStyle = $sheet->getStyle('2:3');
+        $rowStyle->applyFromArray([
+            'font' => ['name' => 'Who knows'],
+        ]);
+        self::assertSame(
+            'Who knows',
+            $sheet->getRowStyle(2)?->getFont()->getName()
+        );
+        self::assertSame(
+            'Who knows',
+            $sheet->getRowStyle(3)?->getFont()->getName()
+        );
+        self::assertNull(
+            $sheet->getRowStyle(1)?->getFont()->getName()
+        );
+        self::assertNull(
+            $sheet->getRowStyle(4)?->getFont()->getName()
+        );
+
+        $spreadsheet->disconnectWorksheets();
+    }
+}

From 0fe14cfd5e775851c2f1f7e4d59db2e221caa97d Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:18:15 -0800
Subject: [PATCH 17/30] Update recipes.md

---
 docs/topics/recipes.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index 8b27155d90..076ac79b58 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -925,6 +925,9 @@ getStyle('A1:M500'), rather than styling the cells individually in a
 loop. This is much faster compared to looping through cells and styling
 them individually.
 
+**Tip** If you are styling entire row(s) or column(s), e.g. getStyle('A:A'), it is recommended to use applyFromArray as described below rather than setting the styles individually as described above.
+Also, starting with release 3.9.0, you should use getRowStyle or getColumnStyle to get the style for an entire row or column.
+
 There is also an alternative manner to set styles. The following code
 sets a cell's style to font bold, alignment right, top border thin and a
 gradient fill:

From b4c1a86fbc57c748ddda49ebc0cad44bb34c2fbb Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 14 Jan 2025 22:30:01 -0800
Subject: [PATCH 18/30] Mpdf and Tcpdf Hidden Columns and Merged Cells

Fix #4319. PR #3495 allowed Mpdf and Tcpdf to handle hidden rows and columns. The handling is a little off when merged cells are part of the output. The fix for Mpdf is pretty straightforward. Tcpdf is a little more convoluted. Dompdf and Html do not require a change. Unit tests are added for the same scenario for all of Mpdf, Tcpdf, Dompdf, and Html.
---
 src/PhpSpreadsheet/Writer/Html.php            |  16 +-
 .../Writer/Dompdf/HideMergeTest.php           | 142 ++++++++++++++++++
 .../Writer/Html/HideMergeTest.php             | 142 ++++++++++++++++++
 .../Writer/Mpdf/HideMergeTest.php             | 131 ++++++++++++++++
 .../Writer/Tcpdf/HideMergeTest.php            | 127 ++++++++++++++++
 5 files changed, 556 insertions(+), 2 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index d70a067f6f..2cc78c263e 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1565,7 +1565,7 @@ private function generateRowWriteCell(
     /**
      * Generate row.
      *
-     * @param array $values Array containing cells in a row
+     * @param array<int, mixed> $values Array containing cells in a row
      * @param int $row Row number (0-based)
      * @param string $cellType eg: 'td'
      */
@@ -1577,7 +1577,19 @@ private function generateRow(Worksheet $worksheet, array $values, int $row, stri
 
         // Write cells
         $colNum = 0;
-        foreach ($values as $cellAddress) {
+        $tcpdfInited = false;
+        foreach ($values as $key => $cellAddress) {
+            if ($this instanceof Pdf\Mpdf) {
+                $colNum = $key - 1;
+            } elseif ($this instanceof Pdf\Tcpdf) {
+                // It appears that Tcpdf requires first cell in tr.
+                $colNum = $key - 1;
+                if (!$tcpdfInited && $key !== 1) {
+                    $tempspan = ($colNum > 1) ? " colspan='$colNum'" : '';
+                    $html .= "<td$tempspan></td>\n";
+                }
+                $tcpdfInited = true;
+            }
             [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum);
 
             // Cell Data
diff --git a/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php
new file mode 100644
index 0000000000..c27545ea57
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Dompdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
+use PHPUnit\Framework\TestCase;
+
+class HideMergeTest extends TestCase
+{
+    public function testHideWithMerge(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        // just some labels for better visualisation of the problem
+        $worksheet->setCellValue('A1', 'A');
+        $worksheet->setCellValue('B1', 'B');
+        $worksheet->setCellValue('C1', 'C');
+        // setting the row height to better visualize the problem
+        for ($i = 1; $i <= 10; ++$i) {
+            $worksheet->getRowDimension($i)->setRowHeight(17);
+        }
+        // Headline - merged over two cells AND two rows
+        $worksheet->mergeCells('B2:C3');
+        $worksheet->setCellValue('B2', 'Hello World Headline');
+        $worksheet->getStyle('B2:C3')->getFont()->setBold(true);
+        $worksheet->getStyle('B2:C3')
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $worksheet->getStyle('B2:C3')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 1 - merge over two rows
+        $worksheet->mergeCells('B4:B5');
+        $worksheet->mergeCells('C4:C5');
+        $worksheet->setCellValue('B4', 'Label 1');
+        $worksheet->setCellValue('C4', 'Text 1');
+        $worksheet->getStyle('B4:B5')->getFont()->setBold(true);
+        $worksheet->getStyle('B4:C5')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B4:B5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C4:C5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 2 - merge over two rows
+        $worksheet->mergeCells('B6:B7');
+        $worksheet->mergeCells('C6:C7');
+        $worksheet->setCellValue('B6', 'Label 2');
+        $worksheet->setCellValue('C6', 'Text 2');
+        $worksheet->getStyle('B6:B7')->getFont()->setBold(true);
+        $worksheet->getStyle('B6:C7')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B6:B7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C6:C7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // This is where the error was introduced (!!!)
+        $worksheet->getColumnDimension('A')->setVisible(false);
+        $Dompdf = new Dompdf($spreadsheet);
+        $html = $Dompdf->generateHtmlAll();
+        $html = preg_replace('/^\\s+/m', '', $html) ?? $html;
+        $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html;
+        self::assertStringContainsString(
+            'table.sheet0 .column0 { display:none }',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row0">'
+                . '<td class="column0 style0 s" style="width:42pt; height:17pt">A</td>'
+                . '<td class="column1 style0 s" style="width:42pt; height:17pt">B</td>'
+                . '<td class="column2 style0 s" style="width:42pt; height:17pt">C</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row1">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '<td class="column1 style1 s style1" style="width:84pt; height:17pt" colspan="2" rowspan="2">Hello World Headline</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row2">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row3">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '<td class="column1 style2 s style2" style="width:42pt; height:17pt" rowspan="2">Label 1</td>'
+                . '<td class="column2 style3 s style3" style="width:42pt; height:17pt" rowspan="2">Text 1</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row4">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row5">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '<td class="column1 style2 s style2" style="width:42pt; height:17pt" rowspan="2">Label 2</td>'
+                . '<td class="column2 style3 s style3" style="width:42pt; height:17pt" rowspan="2">Text 2</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row6">'
+                . '<td class="column0 style0" style="width:42pt; height:17pt">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php
new file mode 100644
index 0000000000..1075bcca2b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+use PHPUnit\Framework\TestCase;
+
+class HideMergeTest extends TestCase
+{
+    public function testHideWithMerge(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        // just some labels for better visualisation of the problem
+        $worksheet->setCellValue('A1', 'A');
+        $worksheet->setCellValue('B1', 'B');
+        $worksheet->setCellValue('C1', 'C');
+        // setting the row height to better visualize the problem
+        for ($i = 1; $i <= 10; ++$i) {
+            $worksheet->getRowDimension($i)->setRowHeight(17);
+        }
+        // Headline - merged over two cells AND two rows
+        $worksheet->mergeCells('B2:C3');
+        $worksheet->setCellValue('B2', 'Hello World Headline');
+        $worksheet->getStyle('B2:C3')->getFont()->setBold(true);
+        $worksheet->getStyle('B2:C3')
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $worksheet->getStyle('B2:C3')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 1 - merge over two rows
+        $worksheet->mergeCells('B4:B5');
+        $worksheet->mergeCells('C4:C5');
+        $worksheet->setCellValue('B4', 'Label 1');
+        $worksheet->setCellValue('C4', 'Text 1');
+        $worksheet->getStyle('B4:B5')->getFont()->setBold(true);
+        $worksheet->getStyle('B4:C5')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B4:B5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C4:C5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 2 - merge over two rows
+        $worksheet->mergeCells('B6:B7');
+        $worksheet->mergeCells('C6:C7');
+        $worksheet->setCellValue('B6', 'Label 2');
+        $worksheet->setCellValue('C6', 'Text 2');
+        $worksheet->getStyle('B6:B7')->getFont()->setBold(true);
+        $worksheet->getStyle('B6:C7')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B6:B7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C6:C7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // This is where the error was introduced (!!!)
+        $worksheet->getColumnDimension('A')->setVisible(false);
+        $Dompdf = new Html($spreadsheet);
+        $html = $Dompdf->generateHtmlAll();
+        $html = preg_replace('/^\\s+/m', '', $html) ?? $html;
+        $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html;
+        self::assertStringContainsString(
+            'table.sheet0 .column0 { display:none }',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row0">'
+                . '<td class="column0 style0 s">A</td>'
+                . '<td class="column1 style0 s">B</td>'
+                . '<td class="column2 style0 s">C</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row1">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '<td class="column1 style1 s style1" colspan="2" rowspan="2">Hello World Headline</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row2">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row3">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '<td class="column1 style2 s style2" rowspan="2">Label 1</td>'
+                . '<td class="column2 style3 s style3" rowspan="2">Text 1</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row4">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row5">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '<td class="column1 style2 s style2" rowspan="2">Label 2</td>'
+                . '<td class="column2 style3 s style3" rowspan="2">Text 2</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row6">'
+                . '<td class="column0 style0">&nbsp;</td>'
+                . '</tr>',
+            $html
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php
new file mode 100644
index 0000000000..a3b789d982
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php
@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Mpdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
+use PHPUnit\Framework\TestCase;
+
+class HideMergeTest extends TestCase
+{
+    public function testHideWithMerge(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        // just some labels for better visualisation of the problem
+        $worksheet->setCellValue('A1', 'A');
+        $worksheet->setCellValue('B1', 'B');
+        $worksheet->setCellValue('C1', 'C');
+        // setting the row height to better visualize the problem
+        for ($i = 1; $i <= 10; ++$i) {
+            $worksheet->getRowDimension($i)->setRowHeight(17);
+        }
+        // Headline - merged over two cells AND two rows
+        $worksheet->mergeCells('B2:C3');
+        $worksheet->setCellValue('B2', 'Hello World Headline');
+        $worksheet->getStyle('B2:C3')->getFont()->setBold(true);
+        $worksheet->getStyle('B2:C3')
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $worksheet->getStyle('B2:C3')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 1 - merge over two rows
+        $worksheet->mergeCells('B4:B5');
+        $worksheet->mergeCells('C4:C5');
+        $worksheet->setCellValue('B4', 'Label 1');
+        $worksheet->setCellValue('C4', 'Text 1');
+        $worksheet->getStyle('B4:B5')->getFont()->setBold(true);
+        $worksheet->getStyle('B4:C5')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B4:B5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C4:C5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 2 - merge over two rows
+        $worksheet->mergeCells('B6:B7');
+        $worksheet->mergeCells('C6:C7');
+        $worksheet->setCellValue('B6', 'Label 2');
+        $worksheet->setCellValue('C6', 'Text 2');
+        $worksheet->getStyle('B6:B7')->getFont()->setBold(true);
+        $worksheet->getStyle('B6:C7')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B6:B7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C6:C7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // This is where the error was introduced (!!!)
+        $worksheet->getColumnDimension('A')->setVisible(false);
+        $mpdf = new Mpdf($spreadsheet);
+        $html = $mpdf->generateHtmlAll();
+        $html = preg_replace('/^\\s+/m', '', $html) ?? $html;
+        $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html;
+        self::assertStringContainsString(
+            '<tr class="row0">'
+                . '<td class="column1 style0 s" style="width:42pt; height:17pt">B</td>'
+                . '<td class="column2 style0 s" style="width:42pt; height:17pt">C</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row1">'
+                . '<td class="column1 style1 s style1" style="width:84pt; height:17pt" colspan="2" rowspan="2">Hello World Headline</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row2">'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row3">'
+                . '<td class="column1 style2 s style2" style="width:42pt; height:17pt" rowspan="2">Label 1</td>'
+                . '<td class="column2 style3 s style3" style="width:42pt; height:17pt" rowspan="2">Text 1</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row4">'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row5">'
+                . '<td class="column1 style2 s style2" style="width:42pt; height:17pt" rowspan="2">Label 2</td>'
+                . '<td class="column2 style3 s style3" style="width:42pt; height:17pt" rowspan="2">Text 2</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr class="row6">'
+                . '</tr>',
+            $html
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php
new file mode 100644
index 0000000000..7b8673489e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Tcpdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
+use PHPUnit\Framework\TestCase;
+
+class HideMergeTest extends TestCase
+{
+    public function testHideWithMerge(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        // just some labels for better visualisation of the problem
+        $worksheet->setCellValue('A1', 'A');
+        $worksheet->setCellValue('B1', 'B');
+        $worksheet->setCellValue('C1', 'C');
+        // setting the row height to better visualize the problem
+        for ($i = 1; $i <= 10; ++$i) {
+            $worksheet->getRowDimension($i)->setRowHeight(17);
+        }
+        // Headline - merged over two cells AND two rows
+        $worksheet->mergeCells('B2:C3');
+        $worksheet->setCellValue('B2', 'Hello World Headline');
+        $worksheet->getStyle('B2:C3')->getFont()->setBold(true);
+        $worksheet->getStyle('B2:C3')
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $worksheet->getStyle('B2:C3')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 1 - merge over two rows
+        $worksheet->mergeCells('B4:B5');
+        $worksheet->mergeCells('C4:C5');
+        $worksheet->setCellValue('B4', 'Label 1');
+        $worksheet->setCellValue('C4', 'Text 1');
+        $worksheet->getStyle('B4:B5')->getFont()->setBold(true);
+        $worksheet->getStyle('B4:C5')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B4:B5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C4:C5')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // Content 2 - merge over two rows
+        $worksheet->mergeCells('B6:B7');
+        $worksheet->mergeCells('C6:C7');
+        $worksheet->setCellValue('B6', 'Label 2');
+        $worksheet->setCellValue('C6', 'Text 2');
+        $worksheet->getStyle('B6:B7')->getFont()->setBold(true);
+        $worksheet->getStyle('B6:C7')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $worksheet->getStyle('B6:B7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+        $worksheet->getStyle('C6:C7')
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->setColor(new Color(Color::COLOR_BLACK));
+
+        // This is where the error was introduced (!!!)
+        $worksheet->getColumnDimension('A')->setVisible(false);
+        $Tcpdf = new Tcpdf($spreadsheet);
+        $html = $Tcpdf->generateHtmlAll();
+        $html = preg_replace('/^\\s+/m', '', $html) ?? $html;
+        $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html;
+        self::assertStringContainsString(
+            '<tbody><tr style="height:17pt">'
+                . '<td></td>'
+                . '<td style="vertical-align:bottom; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp">B</td>'
+                . '<td style="vertical-align:bottom; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp">C</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr style="height:17pt">'
+                . '<td></td>'
+                . '<td style="vertical-align:bottom; text-align:center; border-bottom:1px solid #000000 !important; border-top:1px solid #000000 !important; border-left:1px solid #000000 !important; border-right:1px solid #000000 !important; font-weight:bold; color:#000000; font-family:\'Calibri\'; font-size:11pt; width:84pt; height:17pt" class="gridlines gridlinesp" colspan="2" rowspan="2">Hello World Headline</td>'
+                . '</tr>',
+            $html
+        );
+        $emptyRowCount = substr_count(
+            $html,
+            '<tr style="height:17pt">'
+                . '<td></td>'
+                . '</tr>'
+        );
+        self::assertSame(3, $emptyRowCount);
+        self::assertStringContainsString(
+            '<tr style="height:17pt">'
+                . '<td></td>'
+                . '<td style="vertical-align:middle; border-bottom:1px solid #000000 !important; border-top:1px solid #000000 !important; border-left:1px solid #000000 !important; border-right:1px solid #000000 !important; font-weight:bold; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp" rowspan="2">Label 1</td>'
+                . '<td style="vertical-align:middle; border-bottom:1px solid #000000 !important; border-top:1px solid #000000 !important; border-left:1px solid #000000 !important; border-right:1px solid #000000 !important; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp" rowspan="2">Text 1</td>'
+                . '</tr>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<tr style="height:17pt">'
+                . '<td></td>'
+                . '<td style="vertical-align:middle; border-bottom:1px solid #000000 !important; border-top:1px solid #000000 !important; border-left:1px solid #000000 !important; border-right:1px solid #000000 !important; font-weight:bold; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp" rowspan="2">Label 2</td>'
+                . '<td style="vertical-align:middle; border-bottom:1px solid #000000 !important; border-top:1px solid #000000 !important; border-left:1px solid #000000 !important; border-right:1px solid #000000 !important; color:#000000; font-family:\'Calibri\'; font-size:11pt; text-align:left; width:42pt; height:17pt" class="gridlines gridlinesp" rowspan="2">Text 2</td>'
+                . '</tr>',
+            $html
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}

From d5e69e3686fccdbe3ebd83b3fdef355d7598e45e Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 15 Jan 2025 01:43:42 -0800
Subject: [PATCH 19/30] Tweak One Test

Fluke failure in CI push.
---
 .../Document/PropertiesTest.php               | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
index 1b32aeaec9..dd8dabb21f 100644
--- a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
+++ b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
@@ -8,6 +8,7 @@
 use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class PropertiesTest extends TestCase
@@ -16,7 +17,7 @@ class PropertiesTest extends TestCase
 
     private float $startTime;
 
-    protected function setup(): void
+    protected function setUp(): void
     {
         do {
             // loop to avoid rare situation where timestamp changes
@@ -44,12 +45,19 @@ public function testSetCreator(): void
         self::assertSame($creator, $this->properties->getCreator());
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('providerCreationTime')]
+    #[DataProvider('providerCreationTime')]
     public function testSetCreated(null|int $expectedCreationTime, null|int|string $created): void
     {
-        $expectedCreationTime = $expectedCreationTime ?? $this->startTime;
-
-        $this->properties->setCreated($created);
+        if ($expectedCreationTime === null) {
+            do {
+                // loop to avoid rare situation where timestamp changes
+                $expectedCreationTime = (float) (new DateTime())->format('U');
+                $this->properties->setCreated($created);
+                $endTime = (float) (new DateTime())->format('U');
+            } while ($expectedCreationTime !== $endTime);
+        } else {
+            $this->properties->setCreated($created);
+        }
         self::assertEquals($expectedCreationTime, $this->properties->getCreated());
     }
 
@@ -71,12 +79,19 @@ public function testSetModifier(): void
         self::assertSame($creator, $this->properties->getLastModifiedBy());
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('providerModifiedTime')]
+    #[DataProvider('providerModifiedTime')]
     public function testSetModified(mixed $expectedModifiedTime, null|int|string $modified): void
     {
-        $expectedModifiedTime = $expectedModifiedTime ?? $this->startTime;
-
-        $this->properties->setModified($modified);
+        if ($expectedModifiedTime === null) {
+            do {
+                // loop to avoid rare situation where timestamp changes
+                $expectedModifiedTime = (float) (new DateTime())->format('U');
+                $this->properties->setModified($modified);
+                $endTime = (float) (new DateTime())->format('U');
+            } while ($expectedModifiedTime !== $endTime);
+        } else {
+            $this->properties->setModified($modified);
+        }
         self::assertEquals($expectedModifiedTime, $this->properties->getModified());
     }
 
@@ -146,7 +161,7 @@ public function testSetManager(): void
         self::assertSame($manager, $this->properties->getManager());
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('providerCustomProperties')]
+    #[DataProvider('providerCustomProperties')]
     public function testSetCustomProperties(mixed $expectedType, mixed $expectedValue, string $propertyName, null|bool|float|int|string $propertyValue, ?string $propertyType = null): void
     {
         if ($propertyType === null) {

From 6d11fd27b5339fb0f3c1e8f31bcc49765667788b Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 15 Jan 2025 07:38:36 -0800
Subject: [PATCH 20/30] Html Writer Allow mailto

Fix #4316. A security patch white-listed the protocols that could be used in a hyperlink. This PR adds mailto to the list.
---
 src/PhpSpreadsheet/Writer/Html.php            |  9 ++++--
 .../Writer/Html/MailtoTest.php                | 32 +++++++++++++++++++
 .../Writer/Html/NoJavascriptLinksTest.php     |  2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index d70a067f6f..efe9260929 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1589,10 +1589,15 @@ private function generateRow(Worksheet $worksheet, array $values, int $row, stri
                 $urlDecode1 = html_entity_decode($url, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
                 $urlTrim = preg_replace('/^\\s+/u', '', $urlDecode1) ?? $urlDecode1;
                 $parseScheme = preg_match('/^([\\w\\s]+):/u', strtolower($urlTrim), $matches);
-                if ($parseScheme === 1 && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 's3'], true)) {
+                if ($parseScheme === 1 && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 'mailto', 's3'], true)) {
                     $cellData = htmlspecialchars($url, Settings::htmlEntityFlags());
                 } else {
-                    $cellData = '<a href="' . htmlspecialchars($url, Settings::htmlEntityFlags()) . '" title="' . htmlspecialchars($worksheet->getHyperlink($coordinate)->getTooltip(), Settings::htmlEntityFlags()) . '">' . $cellData . '</a>';
+                    $tooltip = $worksheet->getHyperlink($coordinate)->getTooltip();
+                    $tooltipOut = empty($tooltip) ? '' : (' title="' . htmlspecialchars($tooltip) . '"');
+                    $cellData = '<a href="'
+                        . htmlspecialchars($url) . '"'
+                        . $tooltipOut
+                        . '>' . $cellData . '</a>';
                 }
             }
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php b/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php
new file mode 100644
index 0000000000..e9f250d37f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Html as HtmlWriter;
+use PHPUnit\Framework\TestCase;
+
+class MailtoTest extends TestCase
+{
+    public function testBadHyperlink(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setCellValue('A1', 'Mail Me!');
+        $worksheet->getCell('A1')
+            ->getHyperlink()
+            ->setUrl('mailto:me@example.com');
+        $worksheet->setCellValue('A2', 'Mail You!');
+        $worksheet->getCell('A2')
+            ->getHyperlink()
+            ->setTooltip('go ahead')
+            ->setUrl('mailto:you@example.com');
+        $writer = new HtmlWriter($spreadsheet);
+        $html = $writer->generateHtmlAll();
+        self::assertStringContainsString('<a href="mailto:me@example.com">Mail Me!</a>', $html);
+        self::assertStringContainsString('<a href="mailto:you@example.com" title="go ahead">Mail You!</a>', $html);
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php b/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php
index 7b1a633bc1..cc0511d4fe 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php
@@ -25,7 +25,7 @@ public function testNoJavascriptLinks(): void
 
         $writer = new Html($spreadsheet);
         $html = $writer->generateHTMLAll();
-        self::assertStringContainsString('<td class="column0 style0 s"><a href="http://www.example.com" title="">Click me</a></td>', $html, 'http hyperlink retained');
+        self::assertStringContainsString('<td class="column0 style0 s"><a href="http://www.example.com">Click me</a></td>', $html, 'http hyperlink retained');
         self::assertStringContainsString('<td class="column0 style0 s">javascript:alert(\'hello1\')</td>', $html, 'javascript hyperlink dropped');
         self::assertStringContainsString('<td class="column0 style0 f">javascript:alert(\'hello2\')</td>', $html, 'javascript hyperlink function dropped');
         $spreadsheet->disconnectWorksheets();

From 9ca6846316953e3768dd48d6c211f6ec21fe0265 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:26:08 -0800
Subject: [PATCH 21/30] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3549a766c0..fa2e4d05dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing yet.
+- Ods Reader Sheet Names with Period. [Issue #4311](https://github.com/PHPOffice/PhpSpreadsheet/issues/4311) [PR #4313](https://github.com/PHPOffice/PhpSpreadsheet/pull/4313)
 
 ## 2025-01-11 - 3.8.0
 

From c176cc4f2a40f20ac8b17f171874d31fad82f8c7 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:43:22 -0800
Subject: [PATCH 22/30] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3549a766c0..e68e698f2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Nothing yet.
+- Method for duplicating worksheet in spreadsheet. [PR #4315](https://github.com/PHPOffice/PhpSpreadsheet/pull/4315)
 
 ### Changed
 

From 9b122cd0283943d9ff0c3819cf0884729bde2304 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:44:45 -0800
Subject: [PATCH 23/30] Use Composer/Pcre Part 1 of Many

The native preg functions (preg_match, preg_replace, etc.) often require us to add a lot of useless boilerplate code to satisfy Phpstan, Scrutinizer, etc. Composer/Pcre offers us a way to remove that boilerplate, thereby giving us a cleaner codebase. I decided to try it on a few modules, and saw a result that clearly demonstrated the usefulness of doing this (aside from the cleaner codebase).

Sample 22_Reader_issue1767 reads an Xlsx spreadsheet with complex sheet names used in defined names, and writes it to Xlsx and Xls output files. When I changed Writer/Xls/Parser to use Composer/Pcre, this sample failed in many different places writing the Xls file. It turns out that some regexes were failing not because the string didn't match, but because the regex encountered "catastrophic backtracing". Composer/Pcre throws an exception when this happens; the native preg_match does return false, but we were not checking for that. The regexes in question are now changed to something which works, and formal unit tests are added for them. Finding this previously undetected error indicates that we should proceed with this change.

An alternative to using Composer/Pcre would be to test for false after all the preg calls. I have done this in the two samples changed with this PR. That seems adequate for a small number of changes, but it really just makes for more clutter considering the large number of regexps that we use in our code. I think Composer/Pcre is a better choice.

It isn't quite transparent. Composer forces all regexps to use PREG_UNMATCHED_AS_NULL, so some match fields will now be null instead of null-string (or non-existent if the unmatched field comes at the end). Our test suite doesn't report any problem (yet) due to this change, although Phpstan is sensitive to it. Several Phpstan annotations were eliminated due to this change, but some others are now needed.

It is not necessary to do this all at once. This PR addresses all the calls in Writer. I intend to address other components in several tickets.
---
 composer.json                                 |   1 +
 composer.lock                                 | 160 ++++++------
 samples/Pdf/21b_Pdf.php                       |   3 +-
 samples/Pdf/21c_Pdf.php                       |   5 +-
 src/PhpSpreadsheet/Shared/StringHelper.php    |   5 +
 src/PhpSpreadsheet/Writer/Html.php            |  17 +-
 src/PhpSpreadsheet/Writer/Ods/Content.php     |   7 +-
 src/PhpSpreadsheet/Writer/Ods/Formula.php     |  18 +-
 .../Writer/Ods/NamedExpressions.php           |   9 +-
 src/PhpSpreadsheet/Writer/Ods/Settings.php    |   3 +-
 src/PhpSpreadsheet/Writer/Xls/Parser.php      | 237 ++++++++++++++----
 src/PhpSpreadsheet/Writer/Xls/Workbook.php    |   8 +-
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   |  30 +--
 .../Writer/Xlsx/DefinedNames.php              |   9 +-
 src/PhpSpreadsheet/Writer/Xlsx/Drawing.php    |   5 +-
 .../Writer/Xlsx/FunctionPrefix.php            |   9 +-
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  |   7 +-
 .../Writer/Xls/ParserTest.php                 |  45 ++++
 18 files changed, 387 insertions(+), 191 deletions(-)

diff --git a/composer.json b/composer.json
index 7f1777676c..22d22c1a67 100644
--- a/composer.json
+++ b/composer.json
@@ -79,6 +79,7 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
+        "composer/pcre": "^3.3",
         "maennchen/zipstream-php": "^2.1 || ^3.0",
         "markbaker/complex": "^3.0",
         "markbaker/matrix": "^3.0",
diff --git a/composer.lock b/composer.lock
index 3025170cb3..aa89bcfd80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,87 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f7caa2101e268445a358275ee83b90d9",
+    "content-hash": "264ef911bd6d773a3a9085bc86b0ea48",
     "packages": [
+        {
+            "name": "composer/pcre",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
+            },
+            "type": "library",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-12T16:29:46+00:00"
+        },
         {
             "name": "maennchen/zipstream-php",
             "version": "3.1.1",
@@ -467,85 +546,6 @@
             ],
             "time": "2022-12-23T10:58:28+00:00"
         },
-        {
-            "name": "composer/pcre",
-            "version": "3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
-                "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<1.11.8"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.11.8",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8 || ^9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                },
-                "phpstan": {
-                    "includes": [
-                        "extension.neon"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
-            "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-07-25T09:36:02+00:00"
-        },
         {
             "name": "composer/semver",
             "version": "3.4.2",
diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
index 38ba4d9c45..e9d3402590 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -1,5 +1,6 @@
 <?php
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
@@ -21,7 +22,7 @@ function replaceBody(string $html): string
         </body>
         EOF;
 
-    return preg_replace($bodystring, $bodyrepl, $html) ?? '';
+    return preg_replace($bodystring, $bodyrepl, $html) ?? throw new SpreadsheetException('preg failed');
 }
 
 require __DIR__ . '/../Header.php';
diff --git a/samples/Pdf/21c_Pdf.php b/samples/Pdf/21c_Pdf.php
index 5a6a26d379..66d964aedd 100644
--- a/samples/Pdf/21c_Pdf.php
+++ b/samples/Pdf/21c_Pdf.php
@@ -1,5 +1,6 @@
 <?php
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
@@ -16,7 +17,7 @@ function addHeadersFootersMpdf2000(string $html): string
         odd-footer-name: html_myFooter2;
 
         EOF;
-    $html = preg_replace('/@page page0 {/', $pagerepl, $html) ?? '';
+    $html = preg_replace('/@page page0 {/', $pagerepl, $html) ?? throw new SpreadsheetException('preg 1 failed');
     $bodystring = '/<body>/';
     $simulatedBodyStart = Mpdf::SIMULATED_BODY_START;
     $bodyrepl = <<<EOF
@@ -40,7 +41,7 @@ function addHeadersFootersMpdf2000(string $html): string
 
         EOF;
 
-    return preg_replace($bodystring, $bodyrepl, $html) ?? '';
+    return preg_replace($bodystring, $bodyrepl, $html) ?? throw new SpreadsheetException('preg 2 failed');
 }
 
 $spreadsheet = new Spreadsheet();
diff --git a/src/PhpSpreadsheet/Shared/StringHelper.php b/src/PhpSpreadsheet/Shared/StringHelper.php
index a16b1cafc0..73bb057dfb 100644
--- a/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -638,4 +638,9 @@ public static function testStringAsNumeric(string $textValue): float|string
 
         return (is_numeric(substr($textValue, 0, strlen((string) $v)))) ? $v : $textValue;
     }
+
+    public static function strlenAllowNull(?string $string): int
+    {
+        return strlen("$string");
+    }
 }
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index d70a067f6f..c209db3162 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
@@ -646,13 +647,13 @@ private function writeImageInCell(string $coordinates): string
                 $filename = $drawing->getPath();
 
                 // Strip off eventual '.'
-                $filename = (string) preg_replace('/^[.]/', '', $filename);
+                $filename = Preg::replace('/^[.]/', '', $filename);
 
                 // Prepend images root
                 $filename = $this->getImagesRoot() . $filename;
 
                 // Strip off eventual '.' if followed by non-/
-                $filename = (string) preg_replace('@^[.]([^/])@', '$1', $filename);
+                $filename = Preg::replace('@^[.]([^/])@', '$1', $filename);
 
                 // Convert UTF8 data to PCDATA
                 $filename = htmlspecialchars($filename, Settings::htmlEntityFlags());
@@ -1411,7 +1412,7 @@ private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cel
 
             // Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
             // Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
-            $cellData = (string) preg_replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
+            $cellData = Preg::replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
 
             // convert newline "\n" to '<br>'
             $cellData = nl2br($cellData);
@@ -1587,9 +1588,9 @@ private function generateRow(Worksheet $worksheet, array $values, int $row, stri
             if ($worksheet->hyperlinkExists($coordinate) && !$worksheet->getHyperlink($coordinate)->isInternal()) {
                 $url = $worksheet->getHyperlink($coordinate)->getUrl();
                 $urlDecode1 = html_entity_decode($url, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-                $urlTrim = preg_replace('/^\\s+/u', '', $urlDecode1) ?? $urlDecode1;
-                $parseScheme = preg_match('/^([\\w\\s]+):/u', strtolower($urlTrim), $matches);
-                if ($parseScheme === 1 && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 's3'], true)) {
+                $urlTrim = Preg::replace('/^\\s+/u', '', $urlDecode1);
+                $parseScheme = Preg::isMatch('/^([\\w\\s]+):/u', strtolower($urlTrim), $matches);
+                if ($parseScheme && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 's3'], true)) {
                     $cellData = htmlspecialchars($url, Settings::htmlEntityFlags());
                 } else {
                     $cellData = '<a href="' . htmlspecialchars($url, Settings::htmlEntityFlags()) . '" title="' . htmlspecialchars($worksheet->getHyperlink($coordinate)->getTooltip(), Settings::htmlEntityFlags()) . '">' . $cellData . '</a>';
@@ -1738,8 +1739,8 @@ public static function formatColorStatic(string $value, string $format): string
         $matches = [];
 
         $color_regex = '/^\\[[a-zA-Z]+\\]/';
-        if (preg_match($color_regex, $format, $matches)) {
-            $color = str_replace(['[', ']'], '', $matches[0]);
+        if (Preg::isMatch($color_regex, $format, $matches)) {
+            $color = str_replace(['[', ']'], '', $matches[0]); // @phpstan-ignore-line
             $color = strtolower($color);
         }
 
diff --git a/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/PhpSpreadsheet/Writer/Ods/Content.php
index 3b9cc82458..285f524fe0 100644
--- a/src/PhpSpreadsheet/Writer/Ods/Content.php
+++ b/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
@@ -227,16 +228,16 @@ private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void
                         }
                     }
                     if (isset($attributes['ref'])) {
-                        if (preg_match('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', (string) $attributes['ref'], $matches) == 1) {
+                        if (Preg::isMatch('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', (string) $attributes['ref'], $matches)) {
                             $matrixRowSpan = 1;
                             $matrixColSpan = 1;
                             if (isset($matches[3])) {
                                 $minRow = (int) $matches[2];
                                 // https://github.com/phpstan/phpstan/issues/11602
-                                $maxRow = (int) $matches[5]; // @phpstan-ignore-line
+                                $maxRow = (int) $matches[5];
                                 $matrixRowSpan = $maxRow - $minRow + 1;
                                 $minCol = Coordinate::columnIndexFromString($matches[1]);
-                                $maxCol = Coordinate::columnIndexFromString($matches[4]); // @phpstan-ignore-line
+                                $maxCol = Coordinate::columnIndexFromString($matches[4]);
                                 $matrixColSpan = $maxCol - $minCol + 1;
                             }
                             $objWriter->writeAttribute('table:number-matrix-columns-spanned', "$matrixColSpan");
diff --git a/src/PhpSpreadsheet/Writer/Ods/Formula.php b/src/PhpSpreadsheet/Writer/Ods/Formula.php
index 335df56dd6..4a874c7b15 100644
--- a/src/PhpSpreadsheet/Writer/Ods/Formula.php
+++ b/src/PhpSpreadsheet/Writer/Ods/Formula.php
@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Formula
 {
@@ -33,14 +35,13 @@ public function convertFormula(string $formula, string $worksheetName = ''): str
 
     private function convertDefinedNames(string $formula): string
     {
-        $splitCount = preg_match_all(
+        $splitCount = Preg::matchAllWithOffsets(
             '/' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '/mui',
             $formula,
-            $splitRanges,
-            PREG_OFFSET_CAPTURE
+            $splitRanges
         );
 
-        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0));
         $offsets = array_column($splitRanges[0], 1);
         $values = array_column($splitRanges[0], 0);
 
@@ -60,14 +61,13 @@ private function convertDefinedNames(string $formula): string
 
     private function convertCellReferences(string $formula, string $worksheetName): string
     {
-        $splitCount = preg_match_all(
+        $splitCount = Preg::matchAllWithOffsets(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
             $formula,
-            $splitRanges,
-            PREG_OFFSET_CAPTURE
+            $splitRanges
         );
 
-        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0));
         $offsets = array_column($splitRanges[0], 1);
 
         $worksheets = $splitRanges[2];
@@ -76,7 +76,7 @@ private function convertCellReferences(string $formula, string $worksheetName):
 
         // Replace any commas in the formula with semi-colons for Ods
         // If by chance there are commas in worksheet names, then they will be "fixed" again in the loop
-        //    because we've already extracted worksheet names with our preg_match_all()
+        //    because we've already extracted worksheet names with our Preg::matchAllWithOffsets()
         $formula = str_replace(',', ';', $formula);
         while ($splitCount > 0) {
             --$splitCount;
diff --git a/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
index 0fda160f31..3e622f20d2 100644
--- a/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
+++ b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -80,14 +82,13 @@ private function writeNamedRange(DefinedName $definedName): void
 
     private function convertAddress(DefinedName $definedName, string $address): string
     {
-        $splitCount = preg_match_all(
+        $splitCount = Preg::matchAllWithOffsets(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
             $address,
-            $splitRanges,
-            PREG_OFFSET_CAPTURE
+            $splitRanges
         );
 
-        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0));
         $offsets = array_column($splitRanges[0], 1);
 
         $worksheets = $splitRanges[2];
diff --git a/src/PhpSpreadsheet/Writer/Ods/Settings.php b/src/PhpSpreadsheet/Writer/Ods/Settings.php
index cfe1b598d9..695c604784 100644
--- a/src/PhpSpreadsheet/Writer/Ods/Settings.php
+++ b/src/PhpSpreadsheet/Writer/Ods/Settings.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
@@ -97,7 +98,7 @@ private function writeWorksheetSettings(XMLWriter $objWriter, Worksheet $workshe
     private function writeSelectedCells(XMLWriter $objWriter, Worksheet $worksheet): void
     {
         $selected = $worksheet->getSelectedCells();
-        if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
+        if (Preg::isMatch('/^([a-z]+)([0-9]+)/i', $selected, $matches)) {
             $colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
             $rowSel = (int) $matches[2] - 1;
             $objWriter->startElement('config:config-item');
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 422492d4e8..c0f60d66e1 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -45,7 +46,26 @@ class Parser
     // Invalid sheet title characters cannot occur in the sheet title:
     // *:/\?[]                    (usual invalid sheet title characters)
     // Single quote is represented as a pair ''
-    const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+';
+    // Former value for this constant led to "catastrophic backtracking",
+    //     unable to handle double apostrophes.
+    //     (*COMMIT) should prevent this.
+    const REGEX_SHEET_TITLE_QUOTED = "([^*:/\\\\?\[\]']|'')+";
+
+    const REGEX_CELL_TITLE_QUOTED = "~^'"
+        . self::REGEX_SHEET_TITLE_QUOTED
+        . '(:' . self::REGEX_SHEET_TITLE_QUOTED . ')?'
+        . "'!(*COMMIT)"
+        . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)'
+        . '$~u';
+
+    const REGEX_RANGE_TITLE_QUOTED = "~^'"
+        . self::REGEX_SHEET_TITLE_QUOTED
+        . '(:' . self::REGEX_SHEET_TITLE_QUOTED . ')?'
+        . "'!(*COMMIT)"
+        . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)'
+        . ':'
+        . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)'
+        . '$~u';
 
     /**
      * The index of the character we are currently looking at.
@@ -478,34 +498,34 @@ public function __construct(Spreadsheet $spreadsheet)
      */
     private function convert(string $token): string
     {
-        if (preg_match('/"([^"]|""){0,255}"/', $token)) {
+        if (Preg::isMatch('/"([^"]|""){0,255}"/', $token)) {
             return $this->convertString($token);
         }
         if (is_numeric($token)) {
             return $this->convertNumber($token);
         }
         // match references like A1 or $A$1
-        if (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
+        if (Preg::isMatch('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
             return $this->convertRef2d($token);
         }
         // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
+        if (Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
             return $this->convertRef3d($token);
         }
         // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
+        if (self::matchCellSheetnameQuoted($token)) {
             return $this->convertRef3d($token);
         }
         // match ranges like A1:B2 or $A$1:$B$2
-        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
+        if (Preg::isMatch('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
             return $this->convertRange2d($token);
         }
         // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) {
+        if (Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) {
             return $this->convertRange3d($token);
         }
         // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)\\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)$/u", $token)) {
+        if (self::matchRangeSheetnameQuoted($token)) {
             return $this->convertRange3d($token);
         }
         // operators (including parentheses)
@@ -513,14 +533,14 @@ private function convert(string $token): string
             return pack('C', $this->ptg[$token]);
         }
         // match error codes
-        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
+        if (Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
             return $this->convertError($token);
         }
-        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+        if (Preg::isMatch('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
             return $this->convertDefinedName($token);
         }
         // commented so argument number can be processed correctly. See toReversePolish().
-        /*if (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
+        /*if (Preg::isMatch("/[A-Z0-9\xc0-\xdc\.]+/", $token))
         {
             return($this->convertFunction($token, $this->_func_args));
         }*/
@@ -528,10 +548,10 @@ private function convert(string $token): string
         if ($token == 'arg') {
             return '';
         }
-        if (preg_match('/^true$/i', $token)) {
+        if (Preg::isMatch('/^true$/i', $token)) {
             return $this->convertBool(1);
         }
-        if (preg_match('/^false$/i', $token)) {
+        if (Preg::isMatch('/^false$/i', $token)) {
             return $this->convertBool(0);
         }
 
@@ -547,7 +567,7 @@ private function convert(string $token): string
     private function convertNumber(mixed $num): string
     {
         // Integer in the range 0..2**16-1
-        if ((preg_match('/^\\d+$/', (string) $num)) && ($num <= 65535)) {
+        if ((Preg::isMatch('/^\\d+$/', (string) $num)) && ($num <= 65535)) {
             return pack('Cv', $this->ptg['ptgInt'], $num);
         }
 
@@ -613,7 +633,7 @@ private function convertRange2d(string $range, int $class = 0): string
     {
         // TODO: possible class value 0,1,2 check Formula.pm
         // Split the range into 2 cell refs
-        if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
+        if (Preg::isMatch('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
             [$cell1, $cell2] = explode(':', $range);
         } else {
             // TODO: use real error codes
@@ -658,7 +678,7 @@ private function convertRange3d(string $token): string
         [$cell1, $cell2] = explode(':', $range ?? '');
 
         // Convert the cell references
-        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) {
+        if (Preg::isMatch('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) {
             [$row1, $col1] = $this->cellToPackedRowcol($cell1);
             [$row2, $col2] = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
@@ -774,11 +794,11 @@ private function convertDefinedName(string $name): string
      */
     private function getRefIndex(string $ext_ref): string
     {
-        $ext_ref = (string) preg_replace(["/^'/", "/'$/"], ['', ''], $ext_ref); // Remove leading and trailing ' if any.
+        $ext_ref = Preg::replace(["/^'/", "/'$/"], ['', ''], $ext_ref); // Remove leading and trailing ' if any.
         $ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with '
 
         // Check if there is a sheet range eg., Sheet1:Sheet2.
-        if (preg_match('/:/', $ext_ref)) {
+        if (Preg::isMatch('/:/', $ext_ref)) {
             [$sheet_name1, $sheet_name2] = explode(':', $ext_ref);
 
             $sheet1 = $this->getSheetIndex($sheet_name1);
@@ -894,7 +914,7 @@ private function cellToPackedRowcol(string $cell): array
      */
     private function rangeToPackedRange(string $range): array
     {
-        if (preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match) !== 1) {
+        if (!Preg::isMatch('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match)) {
             // @codeCoverageIgnoreStart
             throw new WriterException('Regexp failure in rangeToPackedRange');
             // @codeCoverageIgnoreEnd
@@ -937,7 +957,7 @@ private function rangeToPackedRange(string $range): array
      */
     private function cellToRowcol(string $cell): array
     {
-        if (preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match) !== 1) {
+        if (!Preg::isMatch('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match)) {
             // @codeCoverageIgnoreStart
             throw new WriterException('Regexp failure in cellToRowcol');
             // @codeCoverageIgnoreEnd
@@ -949,11 +969,11 @@ private function cellToRowcol(string $cell): array
         $row = $match[4];
 
         // Convert base26 column string to a number.
-        $expn = strlen($col_ref) - 1;
+        $expn = strlen($col_ref) - 1; // @phpstan-ignore-line
         $col = 0;
-        $col_ref_length = strlen($col_ref);
+        $col_ref_length = strlen($col_ref); // @phpstan-ignore-line
         for ($i = 0; $i < $col_ref_length; ++$i) {
-            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn;
+            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn; // @phpstan-ignore-line
             --$expn;
         }
 
@@ -1053,52 +1073,109 @@ private function match(string $token): string
         }
 
         // if it's a reference A1 or $A$1 or $A1 or A$1
-        if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.') && ($this->lookAhead !== '!')) {
+        if (
+            Preg::isMatch('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token)
+            && !Preg::isMatch('/\d/', $this->lookAhead)
+            && ($this->lookAhead !== ':')
+            && ($this->lookAhead !== '.')
+            && ($this->lookAhead !== '!')
+        ) {
             return $token;
         }
         // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) {
+        if (
+            Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token)
+            && !Preg::isMatch('/\d/', $this->lookAhead)
+            && ($this->lookAhead !== ':')
+            && ($this->lookAhead !== '.')
+        ) {
             return $token;
         }
         // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) {
+        if (
+            self::matchCellSheetnameQuoted($token)
+            && !Preg::isMatch('/\\d/', $this->lookAhead)
+            && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')
+        ) {
             return $token;
         }
         // if it's a range A1:A2 or $A$1:$A$2
-        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead)) {
+        if (
+            Preg::isMatch(
+                '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/',
+                $token
+            )
+            && !Preg::isMatch('/\d/', $this->lookAhead)
+        ) {
             return $token;
         }
         // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead)) {
+        if (
+            Preg::isMatch(
+                '/^'
+                . self::REGEX_SHEET_TITLE_UNQUOTED
+                . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED
+                . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u',
+                $token
+            )
+            && !Preg::isMatch('/\d/', $this->lookAhead)
+        ) {
             return $token;
         }
         // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead)) {
+        if (
+            self::matchRangeSheetnameQuoted($token)
+            && !Preg::isMatch('/\\d/', $this->lookAhead)
+        ) {
             return $token;
         }
         // If it's a number (check that it's not a sheet name or range)
         if (is_numeric($token) && (!is_numeric($token . $this->lookAhead) || ($this->lookAhead == '')) && ($this->lookAhead !== '!') && ($this->lookAhead !== ':')) {
             return $token;
         }
-        if (preg_match('/"([^"]|""){0,255}"/', $token) && $this->lookAhead !== '"' && (substr_count($token, '"') % 2 == 0)) {
+        if (
+            Preg::isMatch('/"([^"]|""){0,255}"/', $token)
+            && $this->lookAhead !== '"'
+            && (substr_count($token, '"') % 2 == 0)
+        ) {
             // If it's a string (of maximum 255 characters)
             return $token;
         }
         // If it's an error code
-        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token === '#N/A') {
+        if (
+            Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token)
+            || $token === '#N/A'
+        ) {
             return $token;
         }
         // if it's a function call
-        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) && ($this->lookAhead === '(')) {
+        if (
+            Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token)
+            && ($this->lookAhead === '(')
+        ) {
             return $token;
         }
-        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+        if (
+            Preg::isMatch(
+                '/^'
+                . Calculation::CALCULATION_REGEXP_DEFINEDNAME
+                . '$/miu',
+                $token
+            )
+            && $this->spreadsheet->getDefinedName($token) !== null
+        ) {
             return $token;
         }
-        if (preg_match('/^true$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+        if (
+            Preg::isMatch('/^true$/i', $token)
+            && ($this->lookAhead === ')' || $this->lookAhead === ',')
+        ) {
             return $token;
         }
-        if (preg_match('/^false$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+        if (
+            Preg::isMatch('/^false$/i', $token)
+            && ($this->lookAhead === ')' || $this->lookAhead === ',')
+        ) {
             return $token;
         }
         if (str_ends_with($token, ')')) {
@@ -1180,7 +1257,7 @@ private function condition(): array
     private function expression(): array
     {
         // If it's a string return a string node
-        if (preg_match('/"([^"]|""){0,255}"/', $this->currentToken)) {
+        if (Preg::isMatch('/"([^"]|""){0,255}"/', $this->currentToken)) {
             $tmp = str_replace('""', '"', $this->currentToken);
             if (($tmp == '"') || ($tmp == '')) {
                 //    Trap for "" that has been used for an empty string
@@ -1190,12 +1267,17 @@ private function expression(): array
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) || $this->currentToken == '#N/A') { // error code
+        }
+        if (
+            Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken)
+            || $this->currentToken == '#N/A'
+        ) { // error code
             $result = $this->createTree($this->currentToken, 'ptgErr', '');
             $this->advance();
 
             return $result;
-        } elseif ($this->currentToken == '-') { // negative value
+        }
+        if ($this->currentToken == '-') { // negative value
             // catch "-" Term
             $this->advance();
             $result2 = $this->expression();
@@ -1301,20 +1383,28 @@ private function fact(): array
             return $result;
         }
         // if it's a reference
-        if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $this->currentToken)) {
+        if (Preg::isMatch('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $this->currentToken)) {
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
         }
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
+        if (
+            Preg::isMatch(
+                '/^'
+                . self::REGEX_SHEET_TITLE_UNQUOTED
+                . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED
+                . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u',
+                $this->currentToken
+            )
+        ) {
             // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
         }
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) {
+        if (self::matchCellSheetnameQuoted($this->currentToken)) {
             // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
@@ -1322,8 +1412,14 @@ private function fact(): array
             return $result;
         }
         if (
-            preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
-            || preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
+            Preg::isMatch(
+                '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/',
+                $this->currentToken
+            )
+            || Preg::isMatch(
+                '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/',
+                $this->currentToken
+            )
         ) {
             // if it's a range A1:B2 or $A$1:$B$2
             // must be an error?
@@ -1332,7 +1428,16 @@ private function fact(): array
 
             return $result;
         }
-        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $this->currentToken)) {
+        if (
+            Preg::isMatch(
+                '/^'
+                . self::REGEX_SHEET_TITLE_UNQUOTED
+                . '(\\:'
+                . self::REGEX_SHEET_TITLE_UNQUOTED
+                . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u',
+                $this->currentToken
+            )
+        ) {
             // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
@@ -1340,7 +1445,7 @@ private function fact(): array
 
             return $result;
         }
-        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) {
+        if (self::matchRangeSheetnameQuoted($this->currentToken)) {
             // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
@@ -1360,17 +1465,28 @@ private function fact(): array
 
             return $result;
         }
-        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
+        if (
+            Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken)
+            && ($this->lookAhead === '(')
+        ) {
             // if it's a function call
             return $this->func();
         }
-        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) {
+        if (
+            Preg::isMatch(
+                '/^'
+                . Calculation::CALCULATION_REGEXP_DEFINEDNAME
+                . '$/miu',
+                $this->currentToken
+            )
+            && $this->spreadsheet->getDefinedName($this->currentToken) !== null
+        ) {
             $result = $this->createTree('ptgName', $this->currentToken, '');
             $this->advance();
 
             return $result;
         }
-        if (preg_match('/^true|false$/i', $this->currentToken)) {
+        if (Preg::isMatch('/^true|false$/i', $this->currentToken)) {
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
@@ -1491,9 +1607,12 @@ public function toReversePolish(array $tree = []): string
         }
         // if it's a function convert it here (so we can set it's arguments)
         if (
-            preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value'])
-            && !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value'])
-            && !preg_match('/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', $tree['value'])
+            Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value'])
+            && !Preg::isMatch('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value'])
+            && !Preg::isMatch(
+                '/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/',
+                $tree['value']
+            )
             && !is_numeric($tree['value'])
             && !isset($this->ptg[$tree['value']])
         ) {
@@ -1511,4 +1630,20 @@ public function toReversePolish(array $tree = []): string
 
         return $polish . $converted_tree;
     }
+
+    public static function matchCellSheetnameQuoted(string $token): bool
+    {
+        return Preg::isMatch(
+            self::REGEX_CELL_TITLE_QUOTED,
+            $token
+        );
+    }
+
+    public static function matchRangeSheetnameQuoted(string $token): bool
+    {
+        return Preg::isMatch(
+            self::REGEX_RANGE_TITLE_QUOTED,
+            $token
+        );
+    }
 }
diff --git a/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index c2b4496a53..43e9f1cd77 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\DefinedName;
@@ -508,14 +509,13 @@ private function writeAllStyles(): void
     private function parseDefinedNameValue(DefinedName $definedName): string
     {
         $definedRange = $definedName->getValue();
-        $splitCount = preg_match_all(
+        $splitCount = Preg::matchAllWithOffsets(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui',
             $definedRange,
-            $splitRanges,
-            PREG_OFFSET_CAPTURE
+            $splitRanges
         );
 
-        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0));
         $offsets = array_column($splitRanges[0], 1);
 
         $worksheets = $splitRanges[2];
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 5e3aa0b820..743f46d960 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use Composer\Pcre\Preg;
 use GdImage;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
@@ -461,11 +462,11 @@ public function close(): void
             if (str_contains($url, 'sheet://')) {
                 // internal to current workbook
                 $url = str_replace('sheet://', 'internal:', $url);
-            } elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
+            } elseif (Preg::isMatch('/^(http:|https:|ftp:|mailto:)/', $url)) {
                 // URL
-            } elseif (!empty($hyperlinkbase) && preg_match('~^([A-Za-z]:)?[/\\\\]~', $url) !== 1) {
+            } elseif (!empty($hyperlinkbase) && !Preg::isMatch('~^([A-Za-z]:)?[/\\\\]~', $url)) {
                 $url = "$hyperlinkbase$url";
-                if (preg_match('/^(http:|https:|ftp:|mailto:)/', $url) !== 1) {
+                if (!Preg::isMatch('/^(http:|https:|ftp:|mailto:)/', $url)) {
                     $url = 'external:' . $url;
                 }
             } else {
@@ -933,10 +934,10 @@ private function writeUrl(int $row, int $col, string $url): void
     private function writeUrlRange(int $row1, int $col1, int $row2, int $col2, string $url): void
     {
         // Check for internal/external sheet links or default to web link
-        if (preg_match('[^internal:]', $url)) {
+        if (Preg::isMatch('[^internal:]', $url)) {
             $this->writeUrlInternal($row1, $col1, $row2, $col2, $url);
         }
-        if (preg_match('[^external:]', $url)) {
+        if (Preg::isMatch('[^external:]', $url)) {
             $this->writeUrlExternal($row1, $col1, $row2, $col2, $url);
         }
 
@@ -969,8 +970,7 @@ public function writeUrlWeb(int $row1, int $col1, int $row2, int $col2, string $
 
         // Convert URL to a null terminated wchar string
 
-        /** @phpstan-ignore-next-line */
-        $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
+        $url = implode("\0", Preg::split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
         $url = $url . "\0\0\0";
 
         // Pack the length of the URL
@@ -1003,7 +1003,7 @@ private function writeUrlInternal(int $row1, int $col1, int $row2, int $col2, st
         $record = 0x01B8; // Record identifier
 
         // Strip URL type
-        $url = (string) preg_replace('/^internal:/', '', $url);
+        $url = Preg::replace('/^internal:/', '', $url);
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
@@ -1050,7 +1050,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st
     {
         // Network drives are different. We will handle them separately
         // MS/Novell network drives and shares start with \\
-        if (preg_match('[^external:\\\\]', $url)) {
+        if (Preg::isMatch('[^external:\\\\]', $url)) {
             return;
         }
 
@@ -1058,7 +1058,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st
 
         // Strip URL type and change Unix dir separator to Dos style (if needed)
         //
-        $url = (string) preg_replace(['/^external:/', '/\//'], ['', '\\'], $url);
+        $url = Preg::replace(['/^external:/', '/\//'], ['', '\\'], $url);
 
         // Determine if the link is relative or absolute:
         //   relative if link contains no dir separator, "somefile.xls"
@@ -1066,7 +1066,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st
         //   otherwise, absolute
 
         $absolute = 0x00; // relative path
-        if (preg_match('/^[A-Z]:/', $url)) {
+        if (Preg::isMatch('/^[A-Z]:/', $url)) {
             $absolute = 0x02; // absolute path on Windows, e.g. C:\...
         }
         $link_type = 0x01 | $absolute;
@@ -1075,7 +1075,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st
         // parameters accordingly.
         // Split the dir name and sheet name (if it exists)
         $dir_long = $url;
-        if (preg_match('/\\#/', $url)) {
+        if (Preg::isMatch('/\\#/', $url)) {
             $link_type |= 0x08;
         }
 
@@ -1083,11 +1083,11 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st
         $link_type = pack('V', $link_type);
 
         // Calculate the up-level dir count e.g.. (..\..\..\ == 3)
-        $up_count = preg_match_all('/\\.\\.\\\\/', $dir_long, $useless);
+        $up_count = Preg::isMatchAll('/\\.\\.\\\\/', $dir_long, $useless);
         $up_count = pack('v', $up_count);
 
         // Store the short dos dir name (null terminated)
-        $dir_short = (string) preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
+        $dir_short = Preg::replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
 
         // Store the long dir name as a wchar string (non-null terminated)
         //$dir_long = $dir_long . "\0";
@@ -2640,7 +2640,7 @@ private function writeDataValidity(): void
                 $options |= $errorStyle << 4;
 
                 // explicit formula?
-                if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
+                if ($type == 0x03 && Preg::isMatch('/^\".*\"$/', $dataValidation->getFormula1())) {
                     $options |= 0x01 << 7;
                 }
 
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
index 4dac1855e8..f8a70ea55a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -2,10 +2,12 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use Composer\Pcre\Preg;
 use Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
@@ -192,14 +194,13 @@ private function writeNamedRangeForPrintArea(ActualWorksheet $worksheet, int $wo
     private function getDefinedRange(DefinedName $definedName): string
     {
         $definedRange = $definedName->getValue();
-        $splitCount = preg_match_all(
+        $splitCount = Preg::matchAllWithOffsets(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
             $definedRange,
-            $splitRanges,
-            PREG_OFFSET_CAPTURE
+            $splitRanges
         );
 
-        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0));
         $offsets = array_column($splitRanges[0], 1);
 
         $worksheets = $splitRanges[2];
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
index 8a17eb9f16..229afdd069 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
@@ -507,12 +508,12 @@ public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\W
     private function writeVMLHeaderFooterImage(XMLWriter $objWriter, string $reference, HeaderFooterDrawing $image): void
     {
         // Calculate object id
-        if (preg_match('{(\d+)}', md5($reference), $m) !== 1) {
+        if (!Preg::isMatch('{(\d+)}', md5($reference), $m)) {
             // @codeCoverageIgnoreStart
             throw new WriterException('Regexp failure in writeVMLHeaderFooterImage');
             // @codeCoverageIgnoreEnd
         }
-        $id = 1500 + ((int) substr($m[1], 0, 2) * 1);
+        $id = 1500 + ((int) substr($m[1], 0, 2) * 1); // @phpstan-ignore-line
 
         // Calculate offset
         $width = $image->getWidth();
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
index a563bd9130..e17bda70ed 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 
 class FunctionPrefix
@@ -183,7 +184,7 @@ class FunctionPrefix
      */
     protected static function addXlfnPrefix(string $functionString): string
     {
-        return (string) preg_replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString);
+        return Preg::replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString);
     }
 
     /**
@@ -191,7 +192,7 @@ protected static function addXlfnPrefix(string $functionString): string
      */
     protected static function addXlwsPrefix(string $functionString): string
     {
-        return (string) preg_replace(self::XLWSREGEXP, '_xlws.$1(', $functionString);
+        return Preg::replace(self::XLWSREGEXP, '_xlws.$1(', $functionString);
     }
 
     /**
@@ -199,9 +200,9 @@ protected static function addXlwsPrefix(string $functionString): string
      */
     public static function addFunctionPrefix(string $functionString): string
     {
-        $functionString = (string) preg_replace_callback(
+        $functionString = Preg::replaceCallback(
             Calculation::CALCULATION_REGEXP_CELLREF_SPILL,
-            fn (array $matches) => 'ANCHORARRAY(' . substr($matches[0], 0, -1) . ')',
+            fn (array $matches) => 'ANCHORARRAY(' . substr((string) $matches[0], 0, -1) . ')',
             $functionString
         );
 
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 28af258297..28324200b4 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use Composer\Pcre\Preg;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
@@ -1535,7 +1536,7 @@ private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell
 
     private function parseRef(string $coordinate, string $ref): string
     {
-        if (preg_match('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', $ref, $matches) !== 1) {
+        if (!Preg::isMatch('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', $ref, $matches)) {
             return $ref;
         }
         if (!isset($matches[3])) { // single cell, not range
@@ -1543,10 +1544,10 @@ private function parseRef(string $coordinate, string $ref): string
         }
         $minRow = (int) $matches[2];
         // https://github.com/phpstan/phpstan/issues/11602
-        $maxRow = (int) $matches[5]; // @phpstan-ignore-line
+        $maxRow = (int) $matches[5];
         $rows = $maxRow - $minRow + 1;
         $minCol = Coordinate::columnIndexFromString($matches[1]);
-        $maxCol = Coordinate::columnIndexFromString($matches[4]); // @phpstan-ignore-line
+        $maxCol = Coordinate::columnIndexFromString($matches[4]);
         $cols = $maxCol - $minCol + 1;
         $firstCellArray = Coordinate::indexesFromString($coordinate);
         $lastRow = $firstCellArray[1] + $rows - 1;
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
index ac814b8ce3..9d10cdf10d 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
@@ -7,6 +7,7 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 use PhpOffice\PhpSpreadsheet\Writer\Xls\Parser;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ParserTest extends TestCase
@@ -54,4 +55,48 @@ public function testGoodParse(): void
         $parser = new Parser($this->spreadsheet);
         self::assertSame('1e01001e02001e0300', bin2hex($parser->toReversePolish(['left' => 1, 'right' => 2, 'value' => 3])));
     }
+
+    #[DataProvider('cellSheetnameQuotedProvider')]
+    public function testCellSheetnameQuoted(bool $expected, string $address): void
+    {
+        self::assertSame($expected, Parser::matchCellSheetnameQuoted($address));
+    }
+
+    public static function cellSheetnameQuotedProvider(): array
+    {
+        return [
+            [true, '\'TS GK Mustermann Hans 2\'!$N$1'],
+            [true, '\'TS GK Mustermann Hans 2\'!N15'],
+            [true, '\'TS GK Mus\'\'termann Hans 2\'!N15'],
+            [false, '\'TS GK Mus\'termann Hans 2\'!N15'],
+            [false, '\'TS GK Mustermann Hans 2\'!N15:P16'],
+            [false, '\'TS GK Mustermann Hans 2\'!$N$15:$P$16'],
+            [false, 'sheet1!N15'],
+            [false, 'sheet1!N15:P16'],
+            [false, 'N15'],
+            [false, 'N15:P16'],
+        ];
+    }
+
+    #[DataProvider('rangeSheetnameQuotedProvider')]
+    public function testRangeSheetnameQuoted(bool $expected, string $address): void
+    {
+        self::assertSame($expected, Parser::matchRangeSheetnameQuoted($address));
+    }
+
+    public static function rangeSheetnameQuotedProvider(): array
+    {
+        return [
+            [false, '\'TS GK Mustermann Hans 2\'!$N$1'],
+            [false, '\'TS GK Mustermann Hans 2\'!N15'],
+            [false, '\'TS GK Mus\'\'termann Hans 2\'!N15'],
+            [false, '\'TS GK Mus\'termann Hans 2\'!N15'],
+            [true, '\'TS GK Mustermann Hans 2\'!N15:P16'],
+            [true, '\'TS GK Mustermann Hans 2\'!$N$15:$P$16'],
+            [false, 'sheet1!N15'],
+            [false, 'sheet1!N15:P16'],
+            [false, 'N15'],
+            [false, 'N15:P16'],
+        ];
+    }
 }

From a6cd613073f550bee1bf1795e60f3431cfde6a36 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 19 Jan 2025 20:44:50 -0800
Subject: [PATCH 24/30] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3549a766c0..12436812ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Nothing yet.
+- Methods to get style for row or column. [PR #4317](https://github.com/PHPOffice/PhpSpreadsheet/pull/4317)
 
 ### Changed
 

From 12b1690c52f6bf1e8f56edbcac0a9cc02914027e Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 19 Jan 2025 21:09:37 -0800
Subject: [PATCH 25/30] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8e1a1399c..032bc3160f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Ods Reader Sheet Names with Period. [Issue #4311](https://github.com/PHPOffice/PhpSpreadsheet/issues/4311) [PR #4313](https://github.com/PHPOffice/PhpSpreadsheet/pull/4313)
+- Mpdf and Tcpdf Hidden Columns and Merged Cells. [Issue #4319](https://github.com/PHPOffice/PhpSpreadsheet/issues/4319) [PR #4320](https://github.com/PHPOffice/PhpSpreadsheet/pull/4320)
 
 ## 2025-01-11 - 3.8.0
 

From d433504631f181b5c0630b403ff82358f60a7289 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 20 Jan 2025 20:53:08 -0800
Subject: [PATCH 26/30] Add Comp/Pcre Phpstan Extension

Eliminate a number of annotations.
---
 phpstan.neon.dist                          | 1 +
 src/PhpSpreadsheet/Writer/Html.php         | 2 +-
 src/PhpSpreadsheet/Writer/Xls/Parser.php   | 6 +++---
 src/PhpSpreadsheet/Writer/Xlsx/Drawing.php | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 06fbbcdd66..e34d429456 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -2,6 +2,7 @@ includes:
     - phpstan-baseline.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/composer/pcre/extension.neon
 
 parameters:
     level: 8
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index c209db3162..c6f8014017 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1740,7 +1740,7 @@ public static function formatColorStatic(string $value, string $format): string
 
         $color_regex = '/^\\[[a-zA-Z]+\\]/';
         if (Preg::isMatch($color_regex, $format, $matches)) {
-            $color = str_replace(['[', ']'], '', $matches[0]); // @phpstan-ignore-line
+            $color = str_replace(['[', ']'], '', $matches[0]);
             $color = strtolower($color);
         }
 
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index c0f60d66e1..52b4ad3538 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -969,11 +969,11 @@ private function cellToRowcol(string $cell): array
         $row = $match[4];
 
         // Convert base26 column string to a number.
-        $expn = strlen($col_ref) - 1; // @phpstan-ignore-line
+        $expn = strlen($col_ref) - 1;
         $col = 0;
-        $col_ref_length = strlen($col_ref); // @phpstan-ignore-line
+        $col_ref_length = strlen($col_ref);
         for ($i = 0; $i < $col_ref_length; ++$i) {
-            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn; // @phpstan-ignore-line
+            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn;
             --$expn;
         }
 
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
index 229afdd069..ed441b1686 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
@@ -513,7 +513,7 @@ private function writeVMLHeaderFooterImage(XMLWriter $objWriter, string $referen
             throw new WriterException('Regexp failure in writeVMLHeaderFooterImage');
             // @codeCoverageIgnoreEnd
         }
-        $id = 1500 + ((int) substr($m[1], 0, 2) * 1); // @phpstan-ignore-line
+        $id = 1500 + ((int) substr($m[1], 0, 2) * 1);
 
         // Calculate offset
         $width = $image->getWidth();

From 3f8fea0d208e5f1bf368907bd409b5532656f6cc Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:03:07 -0800
Subject: [PATCH 27/30] Delete 2 No-longer-needed Comments

---
 src/PhpSpreadsheet/Writer/Ods/Content.php    | 1 -
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/PhpSpreadsheet/Writer/Ods/Content.php
index 285f524fe0..1c87385c57 100644
--- a/src/PhpSpreadsheet/Writer/Ods/Content.php
+++ b/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -233,7 +233,6 @@ private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void
                             $matrixColSpan = 1;
                             if (isset($matches[3])) {
                                 $minRow = (int) $matches[2];
-                                // https://github.com/phpstan/phpstan/issues/11602
                                 $maxRow = (int) $matches[5];
                                 $matrixRowSpan = $maxRow - $minRow + 1;
                                 $minCol = Coordinate::columnIndexFromString($matches[1]);
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 28324200b4..1e7c5d3e4a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -1543,7 +1543,6 @@ private function parseRef(string $coordinate, string $ref): string
             return $coordinate;
         }
         $minRow = (int) $matches[2];
-        // https://github.com/phpstan/phpstan/issues/11602
         $maxRow = (int) $matches[5];
         $rows = $maxRow - $minRow + 1;
         $minCol = Coordinate::columnIndexFromString($matches[1]);

From d24325ba30862f71874ac504984bbf2515b072b5 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 21 Jan 2025 14:04:16 -0800
Subject: [PATCH 28/30] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 032bc3160f..f686f3e661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Ods Reader Sheet Names with Period. [Issue #4311](https://github.com/PHPOffice/PhpSpreadsheet/issues/4311) [PR #4313](https://github.com/PHPOffice/PhpSpreadsheet/pull/4313)
 - Mpdf and Tcpdf Hidden Columns and Merged Cells. [Issue #4319](https://github.com/PHPOffice/PhpSpreadsheet/issues/4319) [PR #4320](https://github.com/PHPOffice/PhpSpreadsheet/pull/4320)
+- Html Writer Allow mailto. [Issue #4316](https://github.com/PHPOffice/PhpSpreadsheet/issues/4316) [PR #4322](https://github.com/PHPOffice/PhpSpreadsheet/pull/4322)
 
 ## 2025-01-11 - 3.8.0
 

From e7ae646a2d0e8fa7996c73b5bcc3a4fb2fa0b8df Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 21 Jan 2025 15:13:02 -0800
Subject: [PATCH 29/30] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f686f3e661..b5e5b419b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Ods Reader Sheet Names with Period. [Issue #4311](https://github.com/PHPOffice/PhpSpreadsheet/issues/4311) [PR #4313](https://github.com/PHPOffice/PhpSpreadsheet/pull/4313)
 - Mpdf and Tcpdf Hidden Columns and Merged Cells. [Issue #4319](https://github.com/PHPOffice/PhpSpreadsheet/issues/4319) [PR #4320](https://github.com/PHPOffice/PhpSpreadsheet/pull/4320)
 - Html Writer Allow mailto. [Issue #4316](https://github.com/PHPOffice/PhpSpreadsheet/issues/4316) [PR #4322](https://github.com/PHPOffice/PhpSpreadsheet/pull/4322)
+- Use composer/pcre rather than preg_* in Writer. [PR #4323](https://github.com/PHPOffice/PhpSpreadsheet/pull/4323)
 
 ## 2025-01-11 - 3.8.0
 

From 191bf214d95435a247c5c812a26aafe5f0d41d0d Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 21 Jan 2025 19:10:54 -0800
Subject: [PATCH 30/30] Fix 2 Samples

Custom properties would be better in this context using j (no leading 0) rather than d (leading 0) for day of month.

Properties has the same problem, and also needs backslashes before p to make it part of a <sup> tag.
---
 samples/Reading_workbook_data/Custom_properties.php | 2 +-
 samples/Reading_workbook_data/Properties.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/Reading_workbook_data/Custom_properties.php b/samples/Reading_workbook_data/Custom_properties.php
index 26f7c33d06..1a84e73f2d 100644
--- a/samples/Reading_workbook_data/Custom_properties.php
+++ b/samples/Reading_workbook_data/Custom_properties.php
@@ -38,7 +38,7 @@
 
             break;
         case 'd':    // date
-            $propertyValue = is_numeric($propertyValue) ? date('l, d<\s\u\p>S</\s\u\p> F Y g:i A', (int) $propertyValue) : '*****INVALID*****';
+            $propertyValue = is_numeric($propertyValue) ? date('l, j<\s\u\p>S</\s\u\p> F Y g:i A', (int) $propertyValue) : '*****INVALID*****';
             $propertyType = 'date';
 
             break;
diff --git a/samples/Reading_workbook_data/Properties.php b/samples/Reading_workbook_data/Properties.php
index a24a4967a8..441b12c9a5 100644
--- a/samples/Reading_workbook_data/Properties.php
+++ b/samples/Reading_workbook_data/Properties.php
@@ -19,7 +19,7 @@
 
 // Read the Date when the workbook was created (as a PHP timestamp value)
 $creationDatestamp = $spreadsheet->getProperties()->getCreated();
-$creationDate = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'l, d<\s\up>S</\s\up> F Y');
+$creationDate = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'l, j<\s\u\p>S</\s\u\p> F Y');
 $creationTime = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'g:i A');
 $helper->log('<b>Created On: </b>' . $creationDate . ' at ' . $creationTime);
 
@@ -30,7 +30,7 @@
 // Read the Date when the workbook was last modified (as a PHP timestamp value)
 $modifiedDatestamp = $spreadsheet->getProperties()->getModified();
 // Format the date and time using the standard PHP date() function
-$modifiedDate = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'l, d<\s\up>S</\s\up> F Y');
+$modifiedDate = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'l, j<\s\u\p>S</\s\u\p> F Y');
 $modifiedTime = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'g:i A');
 $helper->log('<b>Last Modified On: </b>' . $modifiedDate . ' at ' . $modifiedTime);